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 | |
| 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>
| -rw-r--r-- | .cirrus.yml | 9 | ||||
| -rwxr-xr-x | contrib/cirrus/optional_system_test.sh | 16 | ||||
| -rwxr-xr-x | contrib/cirrus/system_test.sh | 33 |
3 files changed, 36 insertions, 22 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: diff --git a/contrib/cirrus/optional_system_test.sh b/contrib/cirrus/optional_system_test.sh deleted file mode 100755 index dfe8e8a2c..000000000 --- a/contrib/cirrus/optional_system_test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e -source $(dirname $0)/lib.sh - -req_env_var " -GOSRC $GOSRC -OS_RELEASE_ID $OS_RELEASE_ID -OS_RELEASE_VER $OS_RELEASE_VER -" - -show_env_vars - -set -x -cd "$GOSRC" -make localsystem diff --git a/contrib/cirrus/system_test.sh b/contrib/cirrus/system_test.sh new file mode 100755 index 000000000..7c727d336 --- /dev/null +++ b/contrib/cirrus/system_test.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +set -e +source $(dirname $0)/lib.sh + +req_env_var " +GOSRC $GOSRC +OS_RELEASE_ID $OS_RELEASE_ID +OS_RELEASE_VER $OS_RELEASE_VER +" + +show_env_vars + +set -x +cd "$GOSRC" + +case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in + ubuntu-18) + make install.tools "BUILDTAGS=$BUILDTAGS" + make "BUILDTAGS=$BUILDTAGS" + make test-binaries "BUILDTAGS=$BUILDTAGS" + ;; + fedora-28) ;& + centos-7) ;& + rhel-7) + make install.tools + make + make test-binaries + ;; + *) bad_os_id_ver ;; +esac + +make localsystem |