CI: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk
authorGeorge Joseph <gjoseph@digium.com>
Wed, 25 Jul 2018 15:20:20 +0000 (09:20 -0600)
committerGeorge Joseph <gjoseph@digium.com>
Wed, 25 Jul 2018 15:20:20 +0000 (09:20 -0600)
Change-Id: I652f4a0ea5107c778e27a78bccb67b18b0c4e087

tests/CI/gates.jenkinsfile
tests/CI/periodics-daily.jenkinsfile
tests/CI/ref_debug.jenkinsfile
tests/CI/unittests.jenkinsfile

index a0580e5..82a39a3 100644 (file)
@@ -122,7 +122,7 @@ pipeline {
                                                img.inside(dockerOptions + " --name ${bt}-build") {
                                                        echo 'Building..'
                                                        env.CCACHE_DIR = "/srv/cache/ccache"
-                                                       sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"
+                                                       sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"
 
                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,
                                                                artifacts: "${outputdir}/*"
@@ -148,7 +148,7 @@ pipeline {
                                                                img.inside("${dockerOptions} --name ${bt}-${groupName}") {
 
                                                                        lock("${JOB_NAME}.${NODE_NAME}.installer") {
-                                                                               sh 'sudo ./tests/CI/installAsterisk.sh  --user-group=jenkins:users'
+                                                                               sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
                                                                        }
 
                                                                        sh "sudo rm -rf ${groupDir} || : "
index ea08e38..60b0ede 100644 (file)
@@ -47,14 +47,14 @@ pipeline {
                                                stage ("Build") {
                                                        echo 'Building..'
                                                        env.CCACHE_DIR = "/srv/cache/ccache"
-                                                       sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"
+                                                       sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"
 
                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,
                                                                artifacts: "${outputdir}/*"
                                                }
                                                stage ("Docs") {
 
-                                                       sh 'sudo ./tests/CI/installAsterisk.sh  --user-group=jenkins:users'
+                                                       sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME}  --user-group=jenkins:users"
 
                                                        def docUrl = env.GIT_URL.replaceAll(/\/[^\/]+$/, "/publish-docs")
                                                        checkout scm: [$class: 'GitSCM',
index a30c7f2..1071f45 100644 (file)
@@ -47,7 +47,7 @@ pipeline {
                                                img.inside(dockerOptions + " --name ${bt}-build") {
                                                        echo 'Building..'
                                                        env.CCACHE_DIR = "/srv/cache/ccache"
-                                                       sh "./tests/CI/buildAsterisk.sh --ref-debug --output-dir=${outputdir} --cache-dir=/srv/cache"
+                                                       sh "./tests/CI/buildAsterisk.sh --ref-debug --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"
 
                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,
                                                                artifacts: "${outputdir}/*"
@@ -73,7 +73,7 @@ pipeline {
                                                                img.inside("${dockerOptions} --name ${bt}-${groupName}") {
 
                                                                        lock("${JOB_NAME}.${NODE_NAME}.installer") {
-                                                                               sh 'sudo ./tests/CI/installAsterisk.sh  --user-group=jenkins:users'
+                                                                               sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME}  --user-group=jenkins:users"
                                                                        }
 
                                                                        sh "sudo rm -rf ${groupDir} || : "
index bfe56e3..438213b 100644 (file)
@@ -124,7 +124,7 @@ pipeline {
                                                stage ('Build') {
                                                        echo 'Building..'
 
-                                                       sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"
+                                                       sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"
 
                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,
                                                                artifacts: "${outputdir}/*"
@@ -134,7 +134,7 @@ pipeline {
                                                        def outputfile = "${outputdir}/unittests-results.xml"
                                                        def testcmd = "test execute all"
 
-                                                       sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'
+                                                       sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
 
                                                        sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --unittest-command='${testcmd}'"