diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2022-08-23 09:41:42 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2022-08-31 10:10:06 -0400 |
| commit | f68b4047f3b1e934c4fa2e728539923b52b654be (patch) | |
| tree | e5dc1acd23ba36a4d9972b9565e2252d12d889f4 /.cirrus.yml | |
| parent | 25124d74f32fecea660e73c0fe47e24cf1e08652 (diff) | |
| download | sos-f68b4047f3b1e934c4fa2e728539923b52b654be.tar.gz | |
[cirrus] Update Fedora images used in CI tests
The Fedora 36 image is now available on GCP, so update our testing
matrix to use it. Accordingly, this means we no longer need to build or
maintain our own Fedora images going forward.
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d21c576c..e901e5c0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,10 +3,8 @@ # Main environment vars to set for all tasks env: - FEDORA_VER: "35" - FEDORA_PRIOR_VER: "34" - FEDORA_NAME: "fedora-${FEDORA_VER}" - FEDORA_PRIOR_NAME: "fedora-${FEDORA_PRIOR_VER}" + FEDORA_NAME: "fedora-36" + FEDORA_PRIOR_NAME: "fedora-35" UBUNTU_NAME: "ubuntu-22.04" UBUNTU_PRIOR_NAME: "ubuntu-20.04" @@ -20,16 +18,14 @@ env: UBUNTU_PROJECT: "ubuntu-os-cloud" # These are generated images pushed to GCP from Red Hat - # FEDORA_PRIOR to be switched to "stock" images from the Fedora Project - # once the F36 image is pushed. - FEDORA_PRIOR_IMAGE_NAME: "f${FEDORA_PRIOR_VER}-server-sos-testing" FOREMAN_CENTOS_IMAGE_NAME: "foreman-25-centos-8-sos-testing" FOREMAN_DEBIAN_IMAGE_NAME: "foreman-25-debian-10-sos-testing" # Images exist on GCP already CENTOS_9_IMAGE_NAME: "centos-stream-9-v20220621" CENTOS_8_IMAGE_NAME: "centos-stream-8-v20220621" - FEDORA_IMAGE_NAME: "fedora-cloud-base-gcp-${FEDORA_VER}-1-2-x86-64" + 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" @@ -96,7 +92,7 @@ rpm_build_task: BUILD_NAME: ${FEDORA_NAME} VM_IMAGE_NAME: ${FEDORA_IMAGE_NAME} - env: &fedoraprior - PROJECT: ${SOS_PROJECT} + PROJECT: ${FEDORA_PROJECT} BUILD_NAME: ${FEDORA_PRIOR_NAME} VM_IMAGE_NAME: ${FEDORA_PRIOR_IMAGE_NAME} setup_script: | |