Merge pull request #220 from lcarva/RHTAP-4845

Handle new placeholder image

Author: lcarva

hack/wait-for-gitops-update.sh

@@ -5,6 +5,11 @@ GITHUB_REPO=https://github.com/$MY_GITHUB_USER/tssc-dev-gitops
 GITLAB_REPO=https://gitlab.com/$MY_GITLAB_USER/tssc-dev-gitops
 JENKINS_REPO=https://github.com/$MY_GITHUB_USER/tssc-dev-gitops-jenkins
 
+DEFAULT_INIT_IMAGES=(
+    'quay.io/redhat-appstudio/dance-bootstrap-app:latest'
+    'registry.redhat.io/ubi9/httpd-24:latest'
+)
+
 WORK=$(mktemp -d)
 
 GH_LOCAL=$WORK/gh-gitops
@@ -34,11 +39,20 @@ function promoteIfUpdated() {
     DEFAULT_INIT_IMAGE="quay.io/redhat-appstudio/dance-bootstrap-app:latest"
     if [[ "${!PREV_IMAGE_ENV_NAME}" != "$CURRENT_IMAGE" ]]; then
         echo "$REPO dev changes, from ${!PREV_IMAGE_ENV_NAME} to $CURRENT_IMAGE"
-        if [[ "$CURRENT_IMAGE" == "$DEFAULT_INIT_IMAGE" ]]; then
-            echo "Image changed back to default, skipping using PR to promote image"
-        else
+
+        is_default=false
+        for default_image in "${DEFAULT_INIT_IMAGES[@]}"; do
+            if [[ "$CURRENT_IMAGE" == "$default_image" ]]; then
+                echo "Image changed back to default, skipping using PR to promote image"
+                is_default=true
+                break
+            fi
+        done
+
+        if ! "$is_default"; then
             bash $SCRIPTDIR/rhtap-promote --repo $REPO
         fi
+
         eval "$PREV_IMAGE_ENV_NAME"="$CURRENT_IMAGE"
     fi
 }

rhtap/gather-deploy-images.sh

@@ -3,7 +3,10 @@ SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
 # gather-deploy-images
 source $SCRIPTDIR/common.sh
 
-# Top level parameters
+DEFAULT_INIT_IMAGES=(
+    'quay.io/redhat-appstudio/dance-bootstrap-app:latest'
+    'registry.redhat.io/ubi9/httpd-24:latest'
+)
 
 function get-images-per-env() {
     echo "Running $TASK_NAME:get-images-per-env"
@@ -23,11 +26,12 @@ function get-images-per-env() {
         yaml_path=components/${component_name}/overlays/${env}/deployment-patch.yaml
         image=$(yq "$IMAGE_PATH" "$yaml_path")
 
-        # Workaround for RHTAPBUGS-1284
-        if [[ "$image" =~ quay.io/redhat-appstudio/dance-bootstrap-app ]]; then
-            # Don't check the dance-bootstrap-app image
-            continue
-        fi
+        for default_image in "${DEFAULT_INIT_IMAGES[@]}"; do
+            if [[ "$image" == "$default_image" ]]; then
+                # Don't check the default placeholder images
+                continue 2 # Go to the next iteration of outer loop, different environment.
+            fi
+        done
 
         if [ -n "$TARGET_BRANCH" ]; then
             prev_image=$(git show "origin/$TARGET_BRANCH:$yaml_path" | yq "$IMAGE_PATH")