add ccsdk-sli-northbound

[infra/cicd.git] / jjb / infra / update-jenkins-slave.sh

diff --git a/jjb/infra/update-jenkins-slave.sh b/jjb/infra/update-jenkins-slave.sh
index 6d8bdd01ec3917a7ff6d7ecaf14ffaa85577c446..1b1a7c98fd998b2e9a49e869c74c7fb45546f78f 100644 (file)
--- a/jjb/infra/update-jenkins-slave.sh
+++ b/jjb/infra/update-jenkins-slave.sh
@@ -3,6 +3,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+DPKG_LOCK="/var/lib/dpkg/lock-frontend"
 # Wait for other apt process to finish by checking the dpkg lock file.
 try=0
 while sudo lsof ${DPKG_LOCK}  > /dev/null 2>&1 ; do
@@ -42,7 +43,11 @@ echo "----------------------------------------------------"
 echo "Info: Create backup of existing image"
 cd "$WORKSPACE"
 BACKUP_ZONE_ID=$(openstack image list --property name=${IMAGE} -f value -c ID)
-openstack image set --name "${IMAGE}-backup-$GIT_COMMIT" "$BACKUP_ZONE_ID"
+if [ -z ${BACKUP_ZONE_ID} ] ; then
+   echo "Warning: No previous image found to backup"
+else
+   openstack image set --name "${IMAGE}-backup-$GIT_COMMIT" "$BACKUP_ZONE_ID"
+fi
 echo "----------------------------------------------------"
 echo "Info: Updating the CI slave image"
 cd "infra/jenkins/slave-setup/${TARGET}/"