Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 811ee1c

Browse files
committed
[19.03] Jenkinsfile: fix image-based engine using wrong branch
This caused CI to build the engine from master, which has some changes that makes building on this branch fail. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 8ae924b0d4dffb44b7784c2ff346a2abcebfa491 Component: packaging
1 parent c3d8c34 commit 811ee1c

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

components/packaging/Jenkinsfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!groovy
22

33

4-
def genBranch(String arch) {
4+
def genBranch(String arch, String branch) {
55
return [
66
"${arch}": { ->
77
stage("Build engine image on ${arch}") {
8-
wrappedNode(label: "linux&&${arch}", cleanWorkspace: true) {
8+
wrappedNode(label: "linux && ${arch}", cleanWorkspace: true) {
99
try {
1010
checkout scm
11-
sh("git clone https://github.com/docker/engine.git engine")
11+
sh("git clone https://github.com/docker/engine.git")
12+
sh("git -C engine checkout $branch")
1213
sh('make ENGINE_DIR=$(pwd)/engine image')
1314
} finally {
1415
sh('make ENGINE_DIR=$(pwd)/engine clean-image clean-engine')
@@ -66,7 +67,7 @@ arches = [
6667
]
6768

6869
arches.each {
69-
test_steps << genBranch(it)
70+
test_steps << genBranch(it, branch)
7071
}
7172

7273
parallel(test_steps)

0 commit comments

Comments
 (0)