diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e901e5c0..7ca462fd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,6 +6,8 @@ env: FEDORA_NAME: "fedora-36" FEDORA_PRIOR_NAME: "fedora-35" + DEBIAN_NAME: "debian-11" + UBUNTU_NAME: "ubuntu-22.04" UBUNTU_PRIOR_NAME: "ubuntu-20.04" @@ -13,17 +15,15 @@ env: CENTOS_8_NAME: "centos-stream-8" CENTOS_PROJECT: "centos-cloud" + DEBIAN_PROJECT: "debian-cloud" FEDORA_PROJECT: "fedora-cloud" SOS_PROJECT: "sos-devel-jobs" UBUNTU_PROJECT: "ubuntu-os-cloud" - # These are generated images pushed to GCP from Red Hat - 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" + 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" @@ -205,24 +205,30 @@ report_stagetwo_task: report_foreman_task: skip: "!changesInclude('.cirrus.yml', '**/{__init__,apache,foreman,foreman_tests,candlepin,pulp,pulpcore}.py')" + timeout_in: 45m alias: "foreman_integration" - name: "Integration Test - Foreman ${FOREMAN_VER}" + name: "Integration Test - Foreman ${FOREMAN_VER} - ${BUILD_NAME}" depends_on: stageone_report gce_instance: &bigvm <<: *standardvm type: e2-standard-2 matrix: - env: - PROJECT: ${SOS_PROJECT} - VM_IMAGE_NAME: ${FOREMAN_CENTOS_IMAGE_NAME} - # Use the CentOS 8 sos rpm for this task - BUILD_NAME: ${CENTOS_8_NAME} - FOREMAN_VER: "2.5 - CentOS Stream 8" + <<: *centos8 + FOREMAN_VER: "2.5" + - env: + <<: *centos8 + FOREMAN_VER: "3.1" + - env: + <<: *centos8 + FOREMAN_VER: "3.4" - env: - PROJECT: ${SOS_PROJECT} - VM_IMAGE_NAME: ${FOREMAN_DEBIAN_IMAGE_NAME} - FOREMAN_VER: "2.5 - Debian 10" + PROJECT: ${DEBIAN_PROJECT} + VM_IMAGE_NAME: ${DEBIAN_IMAGE_NAME} + BUILD_NAME: ${DEBIAN_NAME} + FOREMAN_VER: "3.4" setup_script: *setup + foreman_setup_script: ./tests/test_data/foreman_setup.sh main_script: PYTHONPATH=tests/ avocado run -p TESTLOCAL=true --test-runner=runner -t foreman tests/product_tests/foreman/ on_failure: fail_script: *faillogs |