Jenkins: fix Docker image build on Linux for master branch

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
hyperledger · Dec 13, 2019 · dc920c9 · dc920c9
1 parent 57797a4
commit dc920c9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.jenkinsci/builders/x64-linux-build-steps.groovy b/.jenkinsci/builders/x64-linux-build-steps.groovy
@@ -78,10 +78,13 @@ def buildSteps(int parallelism, List compilerVersions, String build_type, boolea
            --network=${env.IROHA_NETWORK} postgres:9.5 -c 'max_prepared_transactions=100'
       fi
     """
-
+    referenceBranchOrCommit = 'master'
+    if (scmVars.GIT_LOCAL_BRANCH == referenceBranchOrCommit && scmVars.GIT_PREVIOUS_COMMIT) {
+      referenceBranchOrCommit = scmVars.GIT_PREVIOUS_COMMIT
+    }
     iC = dockerUtils.dockerPullOrBuild("${platform}-develop-build",
         "${env.GIT_RAW_BASE_URL}/${scmVars.GIT_COMMIT}/docker/develop/Dockerfile",
-        "${env.GIT_RAW_BASE_URL}/master/docker/develop/Dockerfile",
+        "${env.GIT_RAW_BASE_URL}/${referenceBranchOrCommit}/docker/develop/Dockerfile",
         scmVars,
         environment,
         forceDockerDevelopBuild,