Skip to content

Commit be6118e

Browse files
committed
updating build logic to support branches and fixing bad variable
1 parent 6223274 commit be6118e

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

Jenkinsfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ pipeline {
123123
stage("Set ENV live build"){
124124
when {
125125
branch "master"
126-
expression {
127-
env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
128-
}
129126
environment name: 'CHANGE_ID', value: ''
130127
}
131128
steps {
@@ -406,9 +403,9 @@ pipeline {
406403
docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
407404
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
408405
fi'''
409-
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${DOCKERHUB_IMAGE}:amd64-latest"
410-
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${DOCKERHUB_IMAGE}:arm32v6-latest"
411-
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${DOCKERHUB_IMAGE}:arm64v8-latest"
406+
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
407+
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest"
408+
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
412409
sh "docker push ${IMAGE}:amd64-${META_TAG}"
413410
sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
414411
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"

0 commit comments

Comments
 (0)