From 46fa5a43ff8ff747ced50e32e1d85cb6850d4697 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 9 Aug 2019 23:00:20 +0000 Subject: [PATCH] use environment for power jobs in Jenkinsfile Signed-off-by: Andrew Hsu (cherry picked from commit 3564b03fbc5e050b4be04512fd1079a5dd355219) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 905b1c0531..0288e8812b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -492,6 +492,7 @@ pipeline { } } stage("Integration tests") { + environment { TEST_SKIP_INTEGRATION_CLI = '1' } steps { sh ''' docker run --rm -t --privileged \ @@ -500,7 +501,7 @@ pipeline { -e DOCKER_EXPERIMENTAL \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \ -e DOCKER_GRAPHDRIVER \ - -e TEST_SKIP_INTEGRATION_CLI=1 \ + -e TEST_SKIP_INTEGRATION_CLI \ -e TIMEOUT \ docker:${GIT_COMMIT} \ hack/make.sh \ @@ -565,6 +566,7 @@ pipeline { } } stage("Integration-cli tests") { + environment { TEST_SKIP_INTEGRATION = '1' } steps { sh ''' docker run --rm -t --privileged \ @@ -572,7 +574,7 @@ pipeline { --name docker-pr$BUILD_NUMBER \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \ -e DOCKER_GRAPHDRIVER \ - -e TEST_SKIP_INTEGRATION=1 \ + -e TEST_SKIP_INTEGRATION \ -e TIMEOUT \ docker:${GIT_COMMIT} \ hack/make.sh \