Browse code
Merge pull request #399 from thaJeztah/19.03_backport_do_the_right_diff_do_the_right_diff
[19.03 backport] Jenkinsfile: set repo and branch, to assist validate_diff()
Andrew Hsu authored on 2019/10/11 02:56:41Showing 1 changed files
| ... | ... |
@@ -87,6 +87,8 @@ pipeline {
|
| 87 | 87 |
-e DOCKER_EXPERIMENTAL \ |
| 88 | 88 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 89 | 89 |
-e DOCKER_GRAPHDRIVER \ |
| 90 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 91 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 90 | 92 |
docker:${GIT_COMMIT} \
|
| 91 | 93 |
hack/validate/default |
| 92 | 94 |
''' |
| ... | ... |
@@ -101,6 +103,8 @@ pipeline {
|
| 101 | 101 |
-e DOCKER_EXPERIMENTAL \ |
| 102 | 102 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 103 | 103 |
-e DOCKER_GRAPHDRIVER \ |
| 104 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 105 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 104 | 106 |
docker:${GIT_COMMIT} \
|
| 105 | 107 |
hack/make.sh \ |
| 106 | 108 |
dynbinary-daemon \ |
| ... | ... |
@@ -169,6 +173,8 @@ pipeline {
|
| 169 | 169 |
-e DOCKER_EXPERIMENTAL \ |
| 170 | 170 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 171 | 171 |
-e DOCKER_GRAPHDRIVER \ |
| 172 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 173 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 172 | 174 |
docker:${GIT_COMMIT} \
|
| 173 | 175 |
hack/test/unit |
| 174 | 176 |
''' |
| ... | ... |
@@ -188,6 +194,8 @@ pipeline {
|
| 188 | 188 |
-e DOCKER_EXPERIMENTAL \ |
| 189 | 189 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 190 | 190 |
-e DOCKER_GRAPHDRIVER \ |
| 191 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 192 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 191 | 193 |
docker:${GIT_COMMIT} \
|
| 192 | 194 |
hack/validate/vendor |
| 193 | 195 |
''' |
| ... | ... |
@@ -281,6 +289,8 @@ pipeline {
|
| 281 | 281 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 282 | 282 |
-e DOCKER_GRAPHDRIVER \ |
| 283 | 283 |
-e TIMEOUT \ |
| 284 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 285 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 284 | 286 |
docker:${GIT_COMMIT} \
|
| 285 | 287 |
hack/make.sh \ |
| 286 | 288 |
"$1" \ |
| ... | ... |
@@ -382,7 +392,7 @@ pipeline {
|
| 382 | 382 |
stage("Build dev image") {
|
| 383 | 383 |
steps {
|
| 384 | 384 |
sh ''' |
| 385 |
- docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .
|
|
| 385 |
+ docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
|
| 386 | 386 |
''' |
| 387 | 387 |
} |
| 388 | 388 |
} |
| ... | ... |
@@ -395,6 +405,8 @@ pipeline {
|
| 395 | 395 |
-e DOCKER_EXPERIMENTAL \ |
| 396 | 396 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 397 | 397 |
-e DOCKER_GRAPHDRIVER \ |
| 398 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 399 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 398 | 400 |
docker:${GIT_COMMIT} \
|
| 399 | 401 |
hack/test/unit |
| 400 | 402 |
''' |
| ... | ... |
@@ -418,6 +430,8 @@ pipeline {
|
| 418 | 418 |
-e TESTDEBUG \ |
| 419 | 419 |
-e TEST_SKIP_INTEGRATION_CLI \ |
| 420 | 420 |
-e TIMEOUT \ |
| 421 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 422 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 421 | 423 |
docker:${GIT_COMMIT} \
|
| 422 | 424 |
hack/make.sh \ |
| 423 | 425 |
dynbinary \ |
| ... | ... |
@@ -486,7 +500,7 @@ pipeline {
|
| 486 | 486 |
stage("Build dev image") {
|
| 487 | 487 |
steps {
|
| 488 | 488 |
sh ''' |
| 489 |
- docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .
|
|
| 489 |
+ docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
|
| 490 | 490 |
''' |
| 491 | 491 |
} |
| 492 | 492 |
} |
| ... | ... |
@@ -501,6 +515,8 @@ pipeline {
|
| 501 | 501 |
-e DOCKER_GRAPHDRIVER \ |
| 502 | 502 |
-e TEST_SKIP_INTEGRATION \ |
| 503 | 503 |
-e TIMEOUT \ |
| 504 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 505 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 504 | 506 |
docker:${GIT_COMMIT} \
|
| 505 | 507 |
hack/make.sh \ |
| 506 | 508 |
dynbinary \ |
| ... | ... |
@@ -567,7 +583,7 @@ pipeline {
|
| 567 | 567 |
} |
| 568 | 568 |
stage("Build dev image") {
|
| 569 | 569 |
steps {
|
| 570 |
- sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
|
|
| 570 |
+ sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
|
|
| 571 | 571 |
} |
| 572 | 572 |
} |
| 573 | 573 |
stage("Unit tests") {
|
| ... | ... |
@@ -579,6 +595,8 @@ pipeline {
|
| 579 | 579 |
-e DOCKER_EXPERIMENTAL \ |
| 580 | 580 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| 581 | 581 |
-e DOCKER_GRAPHDRIVER \ |
| 582 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 583 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 582 | 584 |
docker:${GIT_COMMIT} \
|
| 583 | 585 |
hack/test/unit |
| 584 | 586 |
''' |
| ... | ... |
@@ -602,6 +620,8 @@ pipeline {
|
| 602 | 602 |
-e TESTDEBUG \ |
| 603 | 603 |
-e TEST_SKIP_INTEGRATION_CLI \ |
| 604 | 604 |
-e TIMEOUT \ |
| 605 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 606 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 605 | 607 |
docker:${GIT_COMMIT} \
|
| 606 | 608 |
hack/make.sh \ |
| 607 | 609 |
dynbinary \ |
| ... | ... |
@@ -669,7 +689,7 @@ pipeline {
|
| 669 | 669 |
} |
| 670 | 670 |
stage("Build dev image") {
|
| 671 | 671 |
steps {
|
| 672 |
- sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
|
|
| 672 |
+ sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
|
|
| 673 | 673 |
} |
| 674 | 674 |
} |
| 675 | 675 |
stage("Integration-cli tests") {
|
| ... | ... |
@@ -683,6 +703,8 @@ pipeline {
|
| 683 | 683 |
-e DOCKER_GRAPHDRIVER \ |
| 684 | 684 |
-e TEST_SKIP_INTEGRATION \ |
| 685 | 685 |
-e TIMEOUT \ |
| 686 |
+ -e VALIDATE_REPO=${GIT_URL} \
|
|
| 687 |
+ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
|
|
| 686 | 688 |
docker:${GIT_COMMIT} \
|
| 687 | 689 |
hack/make.sh \ |
| 688 | 690 |
dynbinary \ |