diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-03-29 12:02:42 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-15 11:33:04 -0400 |
| commit | 14910480f1301385d7b83c8d045dc7b1699d37e0 (patch) | |
| tree | 052ebce5c1050af5c67580b4e8b15ac6d19e5458 | |
| parent | 5e3eb985367c0d945b45a2e07b01e3fc37e7e18e (diff) | |
| download | sos-14910480f1301385d7b83c8d045dc7b1699d37e0.tar.gz | |
[cirrus] Add StageTwo test task
Adds a new CirrusCI task to run our StageTwo tests, iff the stageone
task completed successfully. Note that for this task we will only
execute against the latest supported version of each distro we test.
Related: #2431
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | .cirrus.yml | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 0cbcdff6..3fc43bd2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -62,7 +62,7 @@ py_break_task: setup_script: pip install -r requirements.txt main_script: ./bin/sos report --batch -# Run our standard test script across multiple distros on GCP +# Run the stage one (no mocking) tests across all distros on GCP report_stageone_task: alias: "stageone_report" name: "Report Stage One - $BUILD_NAME" @@ -93,12 +93,33 @@ report_stageone_task: PROJECT: ${UBUNTU_PROJECT} BUILD_NAME: ${UBUNTU_PRIOR_NAME} VM_IMAGE_NAME: ${UBUNTU_PRIOR_IMAGE_NAME} - # Ubuntu has sos installed by default, so remove that to avoid any conflicts - remove_sos_script: | + remove_sos_script: &remove_sos | if [ $(command -v apt) ] && [ $(command -v sosreport) ]; then apt -y purge sosreport apt update apt -y install python3-pip fi - setup_script: pip3 install avocado-framework==84.0 + if [ $(command -v dnf) ] && [ $(command -v sos) ]; then + dnf -y remove sos + fi + setup_script: &setup 'pip3 install avocado-framework' main_script: PYTHONPATH=tests/ avocado run -t stageone tests/ + +# IFF the stage one tests all pass, then run stage two for latest distros +report_stagetwo_task: + alias: "stagetwo_report" + name: "Report Stage Two - $BUILD_NAME" + depends_on: stageone_report + gce_instance: *standardvm + matrix: + - env: + PROJECT: ${RH_PROJECT} + BUILD_NAME: ${FEDORA_NAME} + VM_IMAGE_NAME: ${FEDORA_IMAGE_NAME} + - env: + PROJECT: ${UBUNTU_PROJECT} + BUILD_NAME: ${UBUNTU_NAME} + VM_IMAGE_NAME: ${UBUNTU_IMAGE_NAME} + remove_sos_script: *remove_sos + setup_script: *setup + main_script: PYTHONPATH=tests/ avocado run -t stagetwo tests/ |