From b280ea114f0210afcd50936808e0653cfacfe16a Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Wed, 27 May 2020 14:29:00 +0000
Subject: [PATCH] hack: add more debugging to understand exit codepath

Signed-off-by: Tibor Vass <tibor@docker.com>
---
 Jenkinsfile                | 2 +-
 hack/make/test-integration | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4db330ad8d..0337ad7e8f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -286,6 +286,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;
@@ -335,7 +336,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 b9741a594e..1545cc49ee 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"