CI: Add optional uninstall step before installing asterisk

Change-Id: I7dedf1e925eafc3a0adf01dd9dfbe44eb642aab7

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 78a9d244c9799f9f045967c23eafa6c5fd7658a6..ab0fd1cd14c9c0424c687531f73cbe87150c8a5b 100644 (file)
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -153,7 +153,7 @@ pipeline {
                                                                img.inside("${dockerOptions} --name ${bt}-${groupName}") {
 
                                                                        lock("${JOB_NAME}.${NODE_NAME}.installer") {
-                                                                               sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
+                                                                               sh "sudo ./tests/CI/installAsterisk.sh --uninstall-all --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
                                                                        }
 
                                                                        sh "sudo rm -rf ${groupDir} || : "

diff --git a/tests/CI/installAsterisk.sh b/tests/CI/installAsterisk.sh
index 74f5651f6f90311fdcc421cda65ee85a0b01805e..080656674c218eaad1961b04eae4dbf17faa0ea0 100755 (executable)
--- a/tests/CI/installAsterisk.sh
+++ b/tests/CI/installAsterisk.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 CIDIR=$(dirname $(readlink -fn $0))
+UNINSTALL=0
+UNINSTALL_ALL=0
 source $CIDIR/ci.functions
 
 MAKE=`which make`
@@ -10,6 +12,9 @@ if [ x"$DESTDIR" != x ] ; then
 fi
 destdir=${DESTDIR:+DESTDIR=$DESTDIR}
 
+[ $UNINSTALL -gt 0 ] && ${MAKE} ${destdir} uninstall
+[ $UNINSTALL_ALL -gt 0 ] && ${MAKE} ${destdir} uninstall-all
+
 ${MAKE} ${destdir} install || ${MAKE} ${destdir} NOISY_BUILD=yes install || exit 1
 ${MAKE} ${destdir} samples
 if [ x"$DESTDIR" != x ] ; then

diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile
index 2d7276673dbe2c0ee521508abcce523bebe86ac9..8c97379e07295dee8fa11f5f3ee80a4ead527643 100644 (file)
--- a/tests/CI/periodics-daily.jenkinsfile
+++ b/tests/CI/periodics-daily.jenkinsfile
@@ -99,7 +99,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 --uninstall-all --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
                                                                        }
 
                                                                        sh "sudo rm -rf ${groupDir} || : "

diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile
index d046a49bdd01fbf73b329993400fbfa2134ae645..1fa86884d2fe0ab41587f7c4e25f1c31394e5ff7 100644 (file)
--- a/tests/CI/ref_debug.jenkinsfile
+++ b/tests/CI/ref_debug.jenkinsfile
@@ -77,7 +77,7 @@ pipeline {
                                                                img.inside("${dockerOptions} --name ${bt}-${groupName}") {
 
                                                                        lock("${JOB_NAME}.${NODE_NAME}.installer") {
-                                                                               sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME}  --user-group=jenkins:users"
+                                                                               sh "sudo ./tests/CI/installAsterisk.sh  --uninstall-all --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
                                                                        }
 
                                                                        sh "sudo rm -rf ${groupDir} || : "

diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index b019bee9805ff87be92569d91b492049596a85c1..82bafff38e49beec046e3ad1b973c6a5f0ee757e 100644 (file)
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -138,7 +138,7 @@ pipeline {
                                                        def outputfile = "${outputdir}/unittests-results.xml"
                                                        def testcmd = "test execute all"
 
-                                                       sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"
+                                                       sh "sudo ./tests/CI/installAsterisk.sh --uninstall-all --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}'"