1. docker
  2. Commit 46fa5a43ff8ff747ced50e32e1d85cb6850d4697
Browse code

use environment for power jobs in Jenkinsfile

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3564b03fbc5e050b4be04512fd1079a5dd355219)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Andrew Hsu authored on 2019/08/10 08:00:20
Showing 1 changed files
Jenkinsfile
History View file @ 46fa5a4
... ... 
@@ -492,6 +492,7 @@ pipeline {
492 492 
                             }
493 493 
                         }
494 494 
                         stage("Integration tests") {
495 
+                            environment { TEST_SKIP_INTEGRATION_CLI = '1' }
495 496 
                             steps {
496 497 
                                 sh '''
497 498 
                                 docker run --rm -t --privileged \
... ... 
@@ -500,7 +501,7 @@ pipeline {
500 500 
                                   -e DOCKER_EXPERIMENTAL \
501 501 
                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
502 502 
                                   -e DOCKER_GRAPHDRIVER \
503 
-                                  -e TEST_SKIP_INTEGRATION_CLI=1 \
503 
+                                  -e TEST_SKIP_INTEGRATION_CLI \
504 504 
                                   -e TIMEOUT \
505 505 
                                   docker:${GIT_COMMIT} \
506 506 
                                   hack/make.sh \
... ... 
@@ -565,6 +566,7 @@ pipeline {
565 565 
                             }
566 566 
                         }
567 567 
                         stage("Integration-cli tests") {
568 
+                            environment { TEST_SKIP_INTEGRATION = '1' }
568 569 
                             steps {
569 570 
                                 sh '''
570 571 
                                 docker run --rm -t --privileged \
... ... 
@@ -572,7 +574,7 @@ pipeline {
572 572 
                                   --name docker-pr$BUILD_NUMBER \
573 573 
                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
574 574 
                                   -e DOCKER_GRAPHDRIVER \
575 
-                                  -e TEST_SKIP_INTEGRATION=1 \
575 
+                                  -e TEST_SKIP_INTEGRATION \
576 576 
                                   -e TIMEOUT \
577 577 
                                   docker:${GIT_COMMIT} \
578 578 
                                   hack/make.sh \