diff --git a/Jenkinsfile b/Jenkinsfile index 5288790b2c..a4d7f9e18d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -275,6 +275,7 @@ pipeline { sh '''#!/bin/bash # bash is needed so 'jobs -p' works properly # it also accepts setting inline envvars for functions without explicitly exporting + set -x run_tests() { [ -n "$TESTDEBUG" ] && rm= || rm=--rm; @@ -324,7 +325,6 @@ pipeline { # integration-cli second set TEST_INTEGRATION_DEST=3 CONTAINER_NAME=${CONTAINER_NAME}-3 TEST_SKIP_INTEGRATION=1 TESTFLAGS="-test.run Test(DockerSwarmSuite|DockerDaemonSuite|DockerExternalVolumeSuite)/" run_tests & - set +x c=0 for job in $(jobs -p); do wait ${job} || c=$? diff --git a/hack/make/test-integration b/hack/make/test-integration index 5ea41b0a32..c55a6d1706 100755 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -22,6 +22,8 @@ fi cleanup_test_suite_binaries error_on_leaked_containerd_shims + echo exiting test-integration + set -x exit ${testexit} ) 2>&1 | tee -a "$DEST/test.log"