CI: Add optional uninstall step before installing asterisk
Change-Id: I7dedf1e925eafc3a0adf01dd9dfbe44eb642aab7
This commit is contained in:
parent
59f53514ce
commit
914b9e1934
|
@ -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} || : "
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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} || : "
|
||||
|
|
|
@ -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} || : "
|
||||
|
|
|
@ -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}'"
|
||||
|
||||
|
|
Loading…
Reference in New Issue