Merge branch 'main' into e2e_kind_3

Signed-off-by: Coleen Iona Quadros <[email protected]>
stolostron · Apr 24, 2024 · c9bc0e0 · c9bc0e0
2 parents b291cee + b7578a6
commit c9bc0e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/cicd-scripts/customize-mco.sh b/cicd-scripts/customize-mco.sh
@@ -16,7 +16,6 @@ SED_COMMAND=${SED}' -i-e -e'
 source ./scripts/test-utils.sh
 LATEST_SNAPSHOT=${LATEST_SNAPSHOT:-$(get_latest_snapshot)}
 
-# need to add this annotation due to KinD cluster resources are insufficient
 if [[ -n ${IS_KIND_ENV} ]]; then
   source ./tests/run-in-kind/env.sh
 fi

diff --git a/scripts/test-utils.sh b/scripts/test-utils.sh
@@ -2,6 +2,23 @@
 # Copyright (c) 2024 Red Hat, Inc.
 # Copyright Contributors to the Open Cluster Management project
 
+VERSION="2.11.0"
+
+# Use the PR mirror image for PRs against main branch.
+get_pr_image() {
+  BRANCH=""
+  LATEST_SNAPSHOT=""
+
+  if [[ ${PULL_BASE_REF} == "main" ]]; then
+    LATEST_SNAPSHOT="${VERSION}-PR${PULL_NUMBER}-${PULL_PULL_SHA}"
+  fi
+
+  # trim the leading and tailing quotes
+  LATEST_SNAPSHOT="${LATEST_SNAPSHOT#\"}"
+  LATEST_SNAPSHOT="${LATEST_SNAPSHOT%\"}"
+  echo ${LATEST_SNAPSHOT}
+}
+
 # Use snapshot for target release.
 VERSION="2.11.0"