Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
| ... | ... |
@@ -333,6 +333,7 @@ pipeline {
|
| 333 | 333 |
} |
| 334 | 334 |
} |
| 335 | 335 |
stage("Integration tests") {
|
| 336 |
+ environment { TEST_SKIP_INTEGRATION_CLI = '1' }
|
|
| 336 | 337 |
steps {
|
| 337 | 338 |
sh ''' |
| 338 | 339 |
docker run --rm -t --privileged \ |
| ... | ... |
@@ -341,7 +342,7 @@ pipeline {
|
| 341 | 341 |
-e DOCKER_EXPERIMENTAL \ |
| 342 | 342 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 343 | 343 |
-e DOCKER_GRAPHDRIVER \ |
| 344 |
- -e TEST_SKIP_INTEGRATION_CLI=1 \ |
|
| 344 |
+ -e TEST_SKIP_INTEGRATION_CLI \ |
|
| 345 | 345 |
-e TIMEOUT \ |
| 346 | 346 |
docker:${GIT_COMMIT} \
|
| 347 | 347 |
hack/make.sh \ |
| ... | ... |
@@ -408,6 +409,7 @@ pipeline {
|
| 408 | 408 |
} |
| 409 | 409 |
} |
| 410 | 410 |
stage("Integration-cli tests") {
|
| 411 |
+ environment { TEST_SKIP_INTEGRATION = '1' }
|
|
| 411 | 412 |
steps {
|
| 412 | 413 |
sh ''' |
| 413 | 414 |
docker run --rm -t --privileged \ |
| ... | ... |
@@ -415,7 +417,7 @@ pipeline {
|
| 415 | 415 |
--name docker-pr$BUILD_NUMBER \ |
| 416 | 416 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 417 | 417 |
-e DOCKER_GRAPHDRIVER \ |
| 418 |
- -e TEST_SKIP_INTEGRATION=1 \ |
|
| 418 |
+ -e TEST_SKIP_INTEGRATION \ |
|
| 419 | 419 |
-e TIMEOUT \ |
| 420 | 420 |
docker:${GIT_COMMIT} \
|
| 421 | 421 |
hack/make.sh \ |