From 799a48c0e047b29f884d6db221b963a17f05a697 Mon Sep 17 00:00:00 2001
From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Thu, 9 Jan 2020 09:31:08 -0800
Subject: [PATCH] Update update-cloud-images script to use python3.

Use lf-activate-venv() to install openstack based on python3. Also added
error handling (script was ignoring errors by default). Minor cleanup of
syntax that does not effect functionality. Some improvements made to
comments and improved logging.

Issue: RELENG-2647
Change-Id: I4ddc0036bf178ca7185a00454dfa6f26433a8bab
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---
 .../notes/update-cloud-image-1700ad09d44a172e.yaml |  8 ++++
 shell/update-cloud-images.sh                       | 47 +++++++++++-----------
 2 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/update-cloud-image-1700ad09d44a172e.yaml

diff --git a/releasenotes/notes/update-cloud-image-1700ad09d44a172e.yaml b/releasenotes/notes/update-cloud-image-1700ad09d44a172e.yaml
new file mode 100644
index 00000000..d6dca88a
--- /dev/null
+++ b/releasenotes/notes/update-cloud-image-1700ad09d44a172e.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    The update-cloud-images.sh script was using virtualenv to install openstack
+    which fails because the latest version of openstack requires python3.  It
+    fails quietly because that is no error handling in the script (all errors
+    are ignored). The script now uses lf-activate-venv() and it runs with 'set
+    -euo pipefail'.
diff --git a/shell/update-cloud-images.sh b/shell/update-cloud-images.sh
index d3cd18fc..297da339 100644
--- a/shell/update-cloud-images.sh
+++ b/shell/update-cloud-images.sh
@@ -18,22 +18,22 @@
 # 4. Update the image{s} in the config files and yaml files
 # 5. Push the change to Gerrit
 
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade --quiet "pip<10.0.0" setuptools
-pip install --upgrade --quiet python-openstackclient
-pip freeze
+echo "---> update-cloud-images.sh"
 
-set -e
+set -euf -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv python-openstackclient
 
 mkdir -p "$WORKSPACE/archives"
 echo "List of images used on the source repository:"
-grep -Er '(_system_image:|IMAGE_NAME)' \
---exclude-dir="global-jjb" --exclude-dir="common-packer" \
-| grep  ZZCI | awk -F: -e '{print $3}' \
-| grep '\S' | tr -d \'\" | sort -n | uniq \
-| tee "$WORKSPACE/archives/used_image_list.txt"
+grep -Er '(_system_image:|IMAGE_NAME)'                       \
+    --exclude-dir="global-jjb" --exclude-dir="common-packer" \
+    | grep  ZZCI | awk -F: -e '{print $3}'                   \
+    | grep '\S' | tr -d \'\" | sort -n | uniq                \
+    | tee "$WORKSPACE/archives/used_image_list.txt"
 
 while read -r line ; do
     image_in_use="${line}"
@@ -42,34 +42,35 @@ while read -r line ; do
     image_type="${line% -*}"
     # Get the latest images available on the cloud, when $NEW_IMAGE_NAME env
     # var is unset and update all images on Jenkins to the latest.
-    if [[ ${NEW_IMAGE_NAME} != all ]]; then
+    if [[ $NEW_IMAGE_NAME != all ]]; then
         new_image=${NEW_IMAGE_NAME}
         new_image_type="${NEW_IMAGE_NAME% -*}"
         # get the $new_image_type to check the image type is being compared
         [[ ${new_image_type} =~ ${image_type} ]] && continue
     else
         new_image=$(openstack image list --long -f value -c Name -c Protected \
-            | grep "${image_type}.*False" | tail -n-1 | sed 's/ False//')
+            | grep "${image_type}.*False" | tail -n-1 | sed 's/ False//')   \
+            || true
     fi
-    [[ -z ${new_image} ]] && continue
+    [[ -z $new_image ]] && continue
 
-    # strip the timestamp from the image name amd compare
+    # strip the timestamp from the image name
     new_image_isotime=${new_image##*- }
     image_in_use_isotime=${image_in_use##*- }
-    # compare timestamps
+    # Remove '-' & '.' from the timestamp and perform numeric compare
     if [[ ${new_image_isotime//[\-\.]/} -gt ${image_in_use_isotime//[\-\.]/} ]]; then
         # generate a patch to be submited to Gerrit
-        echo "Update old image: ${image_in_use} with new image: ${new_image}"
-        grep -rlE '(_system_image:|IMAGE_NAME)' | xargs sed -i "s/${image_in_use}/${new_image}/"
+        echo "Update old image: $image_in_use with new image: $new_image"
+        grep -rlE '(_system_image:|IMAGE_NAME)' \
+            | xargs sed -i "s/${image_in_use}/${new_image}/"
         # When the script is triggered by upstream packer-merge job
         # update only the requested image and break the loop
-        [[ ${NEW_IMAGE_NAME} != all ]] && break
+        [[ $NEW_IMAGE_NAME != all ]] && break
     else
-        echo "No new image to update: ${new_image}"
+        echo "No new image to update: $new_image"
     fi
 done < "$WORKSPACE/archives/used_image_list.txt"
 
-git remote -v
-git status
 git diff > "$WORKSPACE/archives/new-images-patchset.diff"
 git add -u
+git status
-- 
2.16.6