diff --git a/Jenkinsfile b/Jenkinsfile index 1d99ec5..a1cacd1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - if (env.BRANCH_NAME) { - args += " --build-arg BRANCH=${env.BRANCH_NAME}" + if (env.GIT_LOCAL_BRANCH) { + args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}" } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" @@ -31,7 +31,7 @@ node { checkout scm } - def currentBranch = "${env.BRANCH_NAME}" + def currentBranch = "${env.GIT_LOCAL_BRANCH}" def is_testing = currentBranch.toLowerCase().contains("test") def pl = new org.SHS.Platforms(this) diff --git a/cd b/cd index a3e88f7..31bacbe 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit a3e88f792d58a95f943f1bd0d82d1f522a8b6f8d +Subproject commit 31bacbedae30347688f56acedaf206e4c5874bc8 diff --git a/pip b/pip index 12114b3..4f934fe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 12114b3e778a3816215422b01a1f63e7fbc32e9c +Subproject commit 4f934fef353adf93117166b6ead19a3ee849276b