Feat: Allow use of newer JDKs for Sonar scans

[releng/global-jjb.git] / shell / jenkins-verify-images.sh

diff --git a/shell/jenkins-verify-images.sh b/shell/jenkins-verify-images.sh
index 7545323..483a51b 100755 (executable)
--- a/shell/jenkins-verify-images.sh
+++ b/shell/jenkins-verify-images.sh
@@ -16,25 +16,45 @@ set -eux -o pipefail
 
 error=false
 
-for file in jenkins-config/clouds/openstack/*/*; do
-  # Set the $IMAGE_NAME variable to the the file's IMAGE_NAME value
-  export "$(grep ^IMAGE_NAME= "$file")"
-  # The image should be listed as active
+verify_images()
+{
+    echo "Verifying images on $1"
+    for file in "$1"/*; do
+        # Set the $IMAGE_NAME variable to the the file's IMAGE_NAME value
+        export "$(grep ^IMAGE_NAME= "$file")"
+        # The image should be listed as active
 
-  if ! openstack image list --property name="$IMAGE_NAME" | grep "active"; then
-    echo "ERROR: No matching image found for $IMAGE_NAME"
-    error=true
-  fi
-  # Set the $HARDWARE_ID variable to the the file's HARDWARE_ID value
-  export "$(grep ^HARDWARE_ID= "$file")"
-  # The flavor should be listed. Spaces in grep string ensure complete match.
+        if ! openstack image list --property name="$IMAGE_NAME" | grep "active"; then
+            echo "ERROR: No matching image found for $IMAGE_NAME"
+            error=true
+        fi
+        # Set the $HARDWARE_ID variable to the the file's HARDWARE_ID value
+        export "$(grep ^HARDWARE_ID= "$file")"
+        # The flavor should be listed. Spaces in grep string ensure complete match.
 
-  if ! openstack flavor list | grep " $HARDWARE_ID "; then
-    echo "ERROR: No matching flavor found for $HARDWARE_ID"
-    error=true
-  fi
-done
+        if ! openstack flavor list | grep " $HARDWARE_ID "; then
+            echo "ERROR: No matching flavor found for $HARDWARE_ID"
+            error=true
+        fi
+    done
+}
+
+echo "Verifying that cloud has a master configuration file"
+if [[ -d jenkins-config/clouds/openstack ]]; then
+    for cloud in jenkins-config/clouds/openstack/*; do
+        if [[ -f $cloud/cloud.cfg ]]; then
+            # Get the OS_CLOUD variable from cloud config
+            if ! os_cloud=$(grep -E "^OS_CLOUD=" "$cloud/cloud.cfg" | cut -d'=' -f2); then
+            os_cloud="vex"
+            fi
+            OS_CLOUD=$os_cloud verify_images "$cloud"
+        else
+            echo "ERROR: No cloud.cfg for $cloud"
+            error=true
+        fi
+    done
+fi
 
 if $error; then
-  exit 1
+    exit 1
 fi