opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Simplify optional system-test script

Browse Source 
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>
This commit is contained in:
Chris Evich
2018-11-08 09:41:15 -05:00
parent aa742e9e68
commit 2cc9b78ab9
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.cirrus.yml
View File

@ -76,7 +76,7 @@ optional_system_testing_task:
# later from OS distribution's build systems. # later from OS distribution's build systems.
only_if: >- only_if: >-
$CIRRUS_BRANCH != 'master' && $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: gce_instance:
matrix: matrix:
@ -89,10 +89,7 @@ optional_system_testing_task:
timeout_in: 60m timeout_in: 60m
setup_environment_script: $SCRIPT_BASE/setup_environment.sh setup_environment_script: $SCRIPT_BASE/setup_environment.sh
verify_source_script: $SCRIPT_BASE/verify_source.sh system_test_script: $SCRIPT_BASE/system_test.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
success_script: $SCRIPT_BASE/success.sh success_script: $SCRIPT_BASE/success.sh
@ -107,7 +104,7 @@ build_vm_images_task:
# is present in the most recent commit-message. # is present in the most recent commit-message.
only_if: >- only_if: >-
$CIRRUS_BRANCH == 'master' && $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. # Require tests to pass first.
depends_on: depends_on:

16
contrib/cirrus/optional_system_test.sh
View File

@ -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

33
contrib/cirrus/system_test.sh Executable file
View File

@ -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