diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-06-03 23:35:18 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-06-22 13:40:57 -0400 |
| commit | 05787e501009f0f535f3cf450cc45c3d36d0349f (patch) | |
| tree | d54b2aba2196df1ffc1cb45823d68db17f0f5718 | |
| parent | 44fad4ec0852dd1d16a52b2560d7f23ff478e51c (diff) | |
| download | sos-05787e501009f0f535f3cf450cc45c3d36d0349f.tar.gz | |
[cirrus] Update avocado commands with new test directories
With the addition of the `cleaner_tests/` and `collect_tests/` subdirs,
update the CirrusCI config to include these directories, while still
avoiding the `product_tests/` directory for the "base" stageone and
stagetwo tasks.
Additionally, install python3-pexpect for the stagetwo tests. Currently,
this is only utilized to test the use of the placeholder component for
`collect`. However, in the future we'll be doing actual `collect` tests
which would require this to be installed anyways.
Resolves: #2573
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | .cirrus.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e2318dd5..67842f3c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -111,7 +111,7 @@ report_stageone_task: dnf -y remove sos fi setup_script: &setup 'pip3 install avocado-framework' - main_script: PYTHONPATH=tests/ avocado run -t stageone tests/report_tests tests/vendor_tests/ + main_script: PYTHONPATH=tests/ avocado run -t stageone tests/{report,cleaner,collect,vendor}_tests # IFF the stage one tests all pass, then run stage two for latest distros report_stagetwo_task: @@ -133,8 +133,15 @@ report_stagetwo_task: BUILD_NAME: ${UBUNTU_NAME} VM_IMAGE_NAME: ${UBUNTU_IMAGE_NAME} remove_sos_script: *remove_sos + install_pexpect_script: | + if [ $(command -v apt) ]; then + apt -y install python3-pexpect + fi + if [ $(command -v dnf) ]; then + dnf -y install python3-pexpect + fi setup_script: *setup - main_script: PYTHONPATH=tests/ avocado run -t stagetwo tests/report_tests tests/vendor_tests/ + main_script: PYTHONPATH=tests/ avocado run -t stagetwo tests/{report,cleaner,collect,vendor}_tests report_foreman_task: skip: "!changesInclude('.cirrus.yml', '**/{__init__,apache,foreman,foreman_tests,candlepin,pulp,pulpcore}.py')" |