Merge pull request 'Jenkinsfile' (#263) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #263
This commit was merged in pull request #263.
This commit is contained in:
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
@@ -13,8 +13,8 @@ def build_docker(dist, release_dir, is_testing) {
|
|||||||
if (env.DOCKER_PREFIX) {
|
if (env.DOCKER_PREFIX) {
|
||||||
args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
|
args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
|
||||||
}
|
}
|
||||||
if (env.GIT_LOCAL_BRANCH) {
|
if (env.BRANCH_NAME) {
|
||||||
args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}"
|
args += " --build-arg BRANCH=${env.BRANCH_NAME}"
|
||||||
}
|
}
|
||||||
args += " --build-arg IMAGE_FROM=${dist.docker_image}"
|
args += " --build-arg IMAGE_FROM=${dist.docker_image}"
|
||||||
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
|
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
|
||||||
@@ -31,7 +31,7 @@ node {
|
|||||||
checkout scm
|
checkout scm
|
||||||
}
|
}
|
||||||
|
|
||||||
def currentBranch = "${env.GIT_LOCAL_BRANCH}"
|
def currentBranch = "${env.BRANCH_NAME}"
|
||||||
def is_testing = currentBranch.toLowerCase().contains("test")
|
def is_testing = currentBranch.toLowerCase().contains("test")
|
||||||
|
|
||||||
def pl = new org.SHS.Platforms(this)
|
def pl = new org.SHS.Platforms(this)
|
||||||
|
|||||||
Reference in New Issue
Block a user