diff options
| author | Chris Evich <cevich@redhat.com> | 2018-11-08 09:41:15 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2018-11-13 13:30:48 -0500 |
| commit | 2cc9b78ab97dea596e4c2ca6df0aac930046d626 (patch) | |
| tree | d5c89c1e19a13235518cfcfb56c5dc338504a299 /.cirrus.yml | |
| parent | aa742e9e681d91cf23a7e4e496358cab4d0ececa (diff) | |
| download | podman-2cc9b78ab97dea596e4c2ca6df0aac930046d626.tar.gz podman-2cc9b78ab97dea596e4c2ca6df0aac930046d626.tar.bz2 podman-2cc9b78ab97dea596e4c2ca6df0aac930046d626.zip | |
Cirrus: Simplify optional system-test script
Previously it was required to call the verify, unit, and integration
scripts in order to build/install dependencies, and libpod. This
wastes time during the (optional) system-testing, since the
actual unit/integration testing is also happening in parallel.
Consolidate only the distribution-specific build steps into the
system-testing script. This way, only the required steps are performed
in their respective (parallel) tasks.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 6fd9dc444..c5b73fdc9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -76,7 +76,7 @@ optional_system_testing_task: # later from OS distribution's build systems. only_if: >- $CIRRUS_BRANCH != 'master' && - $CIRRUS_CHANGE_MESSAGE =~ '\*\*\*\s*CIRRUS:\s*SYSTEM\s*TEST\s*\*\*\*' + $CIRRUS_CHANGE_MESSAGE =~ '.*\*\*\*\s*CIRRUS:\s*SYSTEM\s*TEST\s*\*\*\*.*' gce_instance: matrix: @@ -89,10 +89,7 @@ optional_system_testing_task: timeout_in: 60m setup_environment_script: $SCRIPT_BASE/setup_environment.sh - verify_source_script: $SCRIPT_BASE/verify_source.sh - unit_test_script: $SCRIPT_BASE/unit_test.sh - integration_test_script: $SCRIPT_BASE/integration_test.sh - system_test_script: $SCRIPT_BASE/optional_system_test.sh + system_test_script: $SCRIPT_BASE/system_test.sh success_script: $SCRIPT_BASE/success.sh @@ -107,7 +104,7 @@ build_vm_images_task: # is present in the most recent commit-message. only_if: >- $CIRRUS_BRANCH == 'master' && - $CIRRUS_CHANGE_MESSAGE =~ '\*\*\*\s*CIRRUS:\s*REBUILD\s*IMAGES\s*\*\*\*' + $CIRRUS_CHANGE_MESSAGE =~ '.*\*\*\*\s*CIRRUS:\s*REBUILD\s*IMAGES\s*\*\*\*.*' # Require tests to pass first. depends_on: |