From a354599eccffc7143e1212a4d1e9dea48a43d2da Mon Sep 17 00:00:00 2001 From: George Joseph <gjoseph@digium.com> Date: Fri, 27 Jul 2018 12:23:02 -0600 Subject: [PATCH] CI: Add optional uninstall step before installing asterisk Change-Id: I7dedf1e925eafc3a0adf01dd9dfbe44eb642aab7 --- tests/CI/gates.jenkinsfile | 2 +- tests/CI/installAsterisk.sh | 5 +++++ tests/CI/periodics-daily.jenkinsfile | 2 +- tests/CI/ref_debug.jenkinsfile | 2 +- tests/CI/unittests.jenkinsfile | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile index 78a9d244c9..ab0fd1cd14 100644 --- 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 74f5651f6f..080656674c 100755 --- 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 2d7276673d..8c97379e07 100644 --- 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 d046a49bdd..1fa86884d2 100644 --- 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 b019bee980..82bafff38e 100644 --- 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}'" -- GitLab