aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2021-03-02 14:49:28 -0500
committerJake Hunsaker <jhunsake@redhat.com>2021-04-15 11:33:03 -0400
commitfe508683da86ab8d136a2d0d848da3c3f13486ac (patch)
tree85cf08773060c315244ed294fedeb7eac1600c70
parentf568fb219fff5b502882d591ddcc6bd5cc84c7a2 (diff)
downloadsos-fe508683da86ab8d136a2d0d848da3c3f13486ac.tar.gz
[cirrus] Update cirrus config to run avocado
Use avocado to run our test suite instead of the removed simple.sh. Related: #2365 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
-rw-r--r--.cirrus.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index c951c903..0cbcdff6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -44,7 +44,7 @@ nosetests_task:
container:
image: python:slim
setup_script: pip install nose
- nose_script: nosetests -v --with-cover --cover-package=sos tests/
+ nose_script: nosetests -v --with-cover --cover-package=sos tests/unittests
# Run a check on newer upstream python versions to check for possible
# breaks/changes in common modules. This is not meant to check any of the actual
@@ -63,9 +63,9 @@ py_break_task:
main_script: ./bin/sos report --batch
# Run our standard test script across multiple distros on GCP
-report_function_task:
- alias: "functional_report"
- name: "Report functionality test - $BUILD_NAME"
+report_stageone_task:
+ alias: "stageone_report"
+ name: "Report Stage One - $BUILD_NAME"
gce_instance: &standardvm
image_project: "${PROJECT}"
image_name: "${VM_IMAGE_NAME}"
@@ -94,8 +94,11 @@ report_function_task:
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
- setup_script: |
+ remove_sos_script: |
if [ $(command -v apt) ] && [ $(command -v sosreport) ]; then
apt -y purge sosreport
+ apt update
+ apt -y install python3-pip
fi
- main_script: ./tests/simple.sh
+ setup_script: pip3 install avocado-framework==84.0
+ main_script: PYTHONPATH=tests/ avocado run -t stageone tests/