Jenkinsfile: set repo and branch, to assist validate_diff()
This is a continuation of 2a08f33166247da9d4c09d4c6c72cbb8119bf8df;
When running CI in other repositories (e.g. Docker's downstream
docker/engine repository), or other branches, the validation
scripts were calculating the list of changes based on the wrong
information.
This lead to weird failures in CI in a branch where these values
were not updated ':-) (CI on a pull request failed because it detected
that new tests were added to the deprecated `integration-cli` test-suite,
but the pull request did not actually make changes in that area).
This patch uses environment variables set by Jenkins to sets the
correct target repository (and branch) to compare to.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7019b60d0d6f3d69e6ccf481ca0a912905a9c1d7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/10/04 00:39:08Showing 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" \ |
| ... | ... |
@@ -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 \ |
| ... | ... |
@@ -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 \ |
| ... | ... |
@@ -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 \ |
| ... | ... |
@@ -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 \ |