Adjust branch variable for multi branch job
parent
a3e236beaa
commit
2f3e119b54
|
@ -17,7 +17,6 @@ pipeline {
|
||||||
echo 'Building....'
|
echo 'Building....'
|
||||||
script {
|
script {
|
||||||
def DOCKER_TAG = "${env.BUILD_NUMBER}"
|
def DOCKER_TAG = "${env.BUILD_NUMBER}"
|
||||||
def BRANCH_NAME = "${env.GIT_BRANCH.split('/')[1]}"
|
|
||||||
|
|
||||||
dir('ogWebconsole') {
|
dir('ogWebconsole') {
|
||||||
IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
|
IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
|
||||||
|
@ -30,7 +29,6 @@ pipeline {
|
||||||
env.IMAGE_ID_TESTING = IMAGE_ID_TESTING
|
env.IMAGE_ID_TESTING = IMAGE_ID_TESTING
|
||||||
env.IMAGE_ID = IMAGE_ID
|
env.IMAGE_ID = IMAGE_ID
|
||||||
env.LATEST_ID = LATEST_ID
|
env.LATEST_ID = LATEST_ID
|
||||||
env.BRANCH_NAME = BRANCH_NAME
|
|
||||||
docker.build("${IMAGE_ID_TESTING}", "-f Dockerfile-testing .")
|
docker.build("${IMAGE_ID_TESTING}", "-f Dockerfile-testing .")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -92,7 +90,7 @@ pipeline {
|
||||||
body: """
|
body: """
|
||||||
<h1>Opengnsys CI Build ${JOB_NAME} - ${BRANCH_NAME} - ${buildResult}</h1>
|
<h1>Opengnsys CI Build ${JOB_NAME} - ${BRANCH_NAME} - ${buildResult}</h1>
|
||||||
<p>Build Number: ${BUILD_NUMBER}</p>
|
<p>Build Number: ${BUILD_NUMBER}</p>
|
||||||
<p>Build URL: ${BUILD_URL}</p>
|
<p>Build URL: ${BUILD_URL}</p>º
|
||||||
|
|
||||||
Saludos cordiales,
|
Saludos cordiales,
|
||||||
Opengnsys CI
|
Opengnsys CI
|
||||||
|
|
Loading…
Reference in New Issue