diff options
| author | Arif Ali <arif.ali@canonical.com> | 2022-09-28 07:49:29 +0100 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2022-09-29 11:29:28 -0400 |
| commit | a9e6ef3c28caacb8e75a11b8e87a7bc67b2581ba (patch) | |
| tree | 97be42c72e4c41d9603c737b399781b82cb00ce9 | |
| parent | dc2bff9708d7dbb6447ed2c5f28eb9bfd52667a5 (diff) | |
| download | sos-a9e6ef3c28caacb8e75a11b8e87a7bc67b2581ba.tar.gz | |
[testing] Fine tune the testing for ubuntu
There was no testing for ubuntu 18.04, and previous manual testing found
issues, and this is still supported. Add envs similar to fedora and centos
testing. This change also ensures that ubuntu 22.04 is the one that is used
for snap builds. We don't need python3-magic on the OS, as this should now
come in-built within the snap, which will have the right version for binary
checks.
Update images to the latest ones available for Ubuntu
Signed-off-by: Arif Ali <arif.ali@canonical.com>
| -rw-r--r-- | .cirrus.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ac26703d..d38cc598 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,6 +10,7 @@ env: UBUNTU_NAME: "ubuntu-22.04" UBUNTU_PRIOR_NAME: "ubuntu-20.04" + UBUNTU_PRIOR2_NAME: "ubuntu-18.04" CENTOS_9_NAME: "centos-stream-9" CENTOS_8_NAME: "centos-stream-8" @@ -26,8 +27,10 @@ env: DEBIAN_IMAGE_NAME: "debian-11-bullseye-v20220822" FEDORA_IMAGE_NAME: "fedora-cloud-base-gcp-36-20220506-n-0-x86-64" FEDORA_PRIOR_IMAGE_NAME: "fedora-cloud-base-gcp-35-1-2-x86-64" - UBUNTU_IMAGE_NAME: "ubuntu-2204-jammy-v20220622" - UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2004-focal-v20220701" + UBUNTU_IMAGE_NAME: "ubuntu-2204-jammy-v20220924" + UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2004-focal-v20220927" + UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-1804-bionic-v20220901" + UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20220924" # Curl-command prefix for downloading task artifacts, simply add the # the url-encoded task name, artifact name, and path as a suffix. @@ -117,7 +120,7 @@ snap_build_task: name: "snap Build From Checkout" gce_instance: image_project: "${UBUNTU_PROJECT}" - image_name: "${UBUNTU_IMAGE_NAME}" + image_name: "${UBUNTU_SNAP_IMAGE_NAME}" type: e2-medium setup_script: | apt update @@ -151,13 +154,17 @@ report_stageone_task: PROJECT: ${UBUNTU_PROJECT} BUILD_NAME: ${UBUNTU_PRIOR_NAME} VM_IMAGE_NAME: ${UBUNTU_PRIOR_IMAGE_NAME} + - env: &ubuntuprior2 + PROJECT: ${UBUNTU_PROJECT} + BUILD_NAME: ${UBUNTU_PRIOR2_NAME} + VM_IMAGE_NAME: ${UBUNTU_PRIOR2_IMAGE_NAME} setup_script: &setup | if [ $(command -v apt) ]; then echo "$ARTCURL/snap%20Build%20From%20Checkout/packages/sosreport_test_amd64.snap" $ARTCURL/snap%20Build%20From%20Checkout/packages/sosreport_test_amd64.snap apt -y purge sosreport apt update --allow-releaseinfo-change - apt -y install python3-pip snapd python3-magic + apt -y install python3-pip snapd systemctl start snapd snap install ./sosreport_test_amd64.snap --classic --dangerous fi |