diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-15 18:11:29 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-05-05 09:54:51 -0400 |
| commit | a8b16dd147613d69233e52ca561c5feafaf00827 (patch) | |
| tree | 062aee74eb7879f21a61f06bdf7af2ef3e819136 /.cirrus.yml | |
| parent | 566fb53e79c63a3f7e0469730924aca0b0a2e186 (diff) | |
| download | sos-a8b16dd147613d69233e52ca561c5feafaf00827.tar.gz | |
[cirrus] Add testing on CentOS Stream 8
As CentOS Stream now runs ahead of RHEL, instead of behind, using it as
a testing distribution on GCE allows us to have more confidence on those
distributions than testing on Fedora alone.
As CentOS Stream does not have version locks, there is only one version
to test on, rather than two as is the case with Fedora and Ubuntu. The
image we build from will need to be updated more regularly however as
new versions are released following RHEL minor version releases.
Resolves: #2499
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3fc43bd2..9b57e5c1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,20 +7,22 @@ env: FEDORA_PRIOR_VER: "32" FEDORA_NAME: "fedora-${FEDORA_VER}" FEDORA_PRIOR_NAME: "fedora-${FEDORA_PRIOR_VER}" - #RHEL_NAME: "rhel-8.3" UBUNTU_NAME: "ubuntu-20.04" UBUNTU_PRIOR_NAME: "ubuntu-18.04" - RH_PROJECT: "sos-devel-jobs" + CENTOS_NAME: "centos-stream-8" + + CENTOS_PROJECT: "centos-cloud" + SOS_PROJECT: "sos-devel-jobs" UBUNTU_PROJECT: "ubuntu-os-cloud" # These are generated images pushed to GCP from Red Hat FEDORA_IMAGE_NAME: "f${FEDORA_VER}-server-sos-testing" FEDORA_PRIOR_IMAGE_NAME: "f${FEDORA_PRIOR_VER}-server-sos-testing" - #RHEL_IMAGE_NAME: "${RHEL_NAME}-server-sos-testing" # Images exist on GCP already + CENTOS_IMAGE_NAME: "centos-stream-8-v20210316" UBUNTU_IMAGE_NAME: "ubuntu-2004-focal-v20201111" UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-1804-bionic-v20201111" @@ -70,21 +72,22 @@ report_stageone_task: image_project: "${PROJECT}" image_name: "${VM_IMAGE_NAME}" cpu: 2 - memory: "2Gb" + memory: "4Gb" # minimum disk size is 20 disk: 20 matrix: - env: - PROJECT: ${RH_PROJECT} + PROJECT: ${CENTOS_PROJECT} + BUILD_NAME: ${CENTOS_NAME} + VM_IMAGE_NAME: ${CENTOS_IMAGE_NAME} + - env: + PROJECT: ${SOS_PROJECT} BUILD_NAME: ${FEDORA_NAME} VM_IMAGE_NAME: ${FEDORA_IMAGE_NAME} - env: - PROJECT: ${RH_PROJECT} + PROJECT: ${SOS_PROJECT} BUILD_NAME: ${FEDORA_PRIOR_NAME} VM_IMAGE_NAME: ${FEDORA_PRIOR_IMAGE_NAME} - # - env: - # BUILD_NAME: ${RHEL_NAME} - # VM_IMAGE_NAME: ${RHEL_IMAGE_NAME} - env: PROJECT: ${UBUNTU_PROJECT} BUILD_NAME: ${UBUNTU_NAME} @@ -113,7 +116,11 @@ report_stagetwo_task: gce_instance: *standardvm matrix: - env: - PROJECT: ${RH_PROJECT} + PROJECT: ${CENTOS_PROJECT} + BUILD_NAME: ${CENTOS_NAME} + VM_IMAGE_NAME: ${CENTOS_IMAGE_NAME} + - env: + PROJECT: ${SOS_PROJECT} BUILD_NAME: ${FEDORA_NAME} VM_IMAGE_NAME: ${FEDORA_IMAGE_NAME} - env: |