fixup script

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

scripts/e2e_test_fixtures.sh

@@ -107,23 +107,11 @@ INDEX_V2="${REGISTRY}/busybox-dependencies-index:2.0.0-with-ListBundles-method-$
 TEST_CATALOG_IMAGE="${REGISTRY}/test-catalog:${OPM_VERSION}"
 
 # Prints true if changes are detected, false otherwise
-if [ "CHECK" = true ]; then
+if [ "$CHECK" = "true" ]; then
   check_changes
   exit 0
 fi
 
-# Assumes images are already built, kind cluster is running, and kubeconfig is set
-if [ "$LOAD_KIND" = true ]; then
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V1_IMAGE}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V1_DEP_IMAGE}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V2_IMAGE}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V2_DEP_IMAGE}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${INDEX_V1}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${INDEX_V2}"
-  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${TEST_CATALOG_IMAGE}"
-  exit 0
-fi
-
 if [ "$BUILD" = "true" ]; then
   # Busybox Operator
   # Build bundles
@@ -144,6 +132,18 @@ if [ "$BUILD" = "true" ]; then
   ${CONTAINER_RUNTIME} tag "${INDEX_V2}" "${TEST_CATALOG_IMAGE}"
 fi
 
+# Assumes images are already built, kind cluster is running, and kubeconfig is set
+if [ "$LOAD_KIND" = true ]; then
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V1_IMAGE}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V1_DEP_IMAGE}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V2_IMAGE}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${BUNDLE_V2_DEP_IMAGE}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${INDEX_V1}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${INDEX_V2}"
+  ${KIND} load docker-image --name="${KIND_CLUSTER_NAME}" "${TEST_CATALOG_IMAGE}"
+fi
+
+# Assumes images are already built
 if [ "${SAVE}" = true ]; then
   ${CONTAINER_RUNTIME} save "${BUNDLE_V1_IMAGE}" | gzip > bundlev1.tar.gz
   ${CONTAINER_RUNTIME} save "${BUNDLE_V1_DEP_IMAGE}" | gzip > bundlev1dep.tar.gz
@@ -157,6 +157,7 @@ if [ "${SAVE}" = true ]; then
   ${CONTAINER_RUNTIME} save "${TEST_CATALOG_IMAGE}" | gzip > testcatalog.tar.gz
 fi
 
+# Assumes images are already built
 if [ "$PUSH" = true ]; then
   # push bundles
   ${CONTAINER_RUNTIME} push "${BUNDLE_V1_IMAGE}"