Merge pull request #20 from mcattamoredhat/update-test-script

test: disable ocp4 in iot-installer-f39
mcattamoredhat · May 16, 2024 · 67a8f92 · 67a8f92
2 parents 5255d8e + 82b8484
commit 67a8f92
Showing 1 changed file with 34 additions and 16 deletions.
diff --git a/ostree-ng.sh b/ostree-ng.sh
@@ -18,8 +18,10 @@ UEFI_GUEST_ADDRESS=192.168.100.51
 HTTP_GUEST_ADDRESS=192.168.100.52
 PROD_REPO=/var/www/html/repo
 STAGE_REPO_ADDRESS=192.168.200.1
+STAGE_OCP4_ADDRESS=192.168.200.2
 STAGE_OCP4_SERVER_NAME="edge-stage-server"
-STAGE_OCP4_REPO_URL="http://${STAGE_OCP4_SERVER_NAME}-${QUAY_REPO_TAG}-rhel-edge.apps.ocp-c1.prod.psi.redhat.com/repo/"
+# STAGE_OCP4_REPO_URL="http://${STAGE_OCP4_SERVER_NAME}-${QUAY_REPO_TAG}-rhel-edge.apps.ocp-c1.prod.psi.redhat.com/repo/"
+STAGE_OCP4_REPO_URL="http://${STAGE_OCP4_ADDRESS}:8080/repo/"
 CONTAINER_IMAGE_TYPE=edge-container
 INSTALLER_IMAGE_TYPE=edge-installer
 CONTAINER_FILENAME=container.tar
@@ -664,27 +666,39 @@ fi
 greenprint "Prepare container network"
 sudo podman network inspect edge >/dev/null 2>&1 || sudo podman network create --driver=bridge --subnet=192.168.200.0/24 --gateway=192.168.200.254 edge
 
+# Disable OCP4 due to issue https://github.com/virt-s1/rhel-edge/issues/7544
 # Run stage repo in OCP4
-greenprint "Running stage repo in OCP4"
-oc login --token="${OCP4_TOKEN}" --server=https://api.ocp-c1.prod.psi.redhat.com:6443 -n rhel-edge --insecure-skip-tls-verify
-oc process -f tools/edge-stage-server-template.yaml -p EDGE_STAGE_REPO_TAG="${QUAY_REPO_TAG}" -p EDGE_STAGE_SERVER_NAME="${STAGE_OCP4_SERVER_NAME}" | oc apply -f -
-
-for _ in $(seq 0 60); do
-    RETURN_CODE=$(curl -o /dev/null -s -w "%{http_code}" "${STAGE_OCP4_REPO_URL}refs/heads/${OSTREE_REF}")
-    if [[ $RETURN_CODE == 200 ]]; then
-        echo "Stage repo is ready"
-        break
-    fi
-    sleep 10
-done
+# greenprint "Running stage repo in OCP4"
+# oc login --token="${OCP4_TOKEN}" --server=https://api.ocp-c1.prod.psi.redhat.com:6443 -n rhel-edge --insecure-skip-tls-verify
+# oc process -f tools/edge-stage-server-template.yaml -p EDGE_STAGE_REPO_TAG="${QUAY_REPO_TAG}" -p EDGE_STAGE_SERVER_NAME="${STAGE_OCP4_SERVER_NAME}" | oc apply -f -
+# 
+# for _ in $(seq 0 60); do
+#     RETURN_CODE=$(curl -o /dev/null -s -w "%{http_code}" "${STAGE_OCP4_REPO_URL}refs/heads/${OSTREE_REF}")
+#     if [[ $RETURN_CODE == 200 ]]; then
+#         echo "Stage repo is ready"
+#         break
+#     fi
+#     sleep 10
+# done
+
+QUAY_REPO_URL_AUX=$(echo ${QUAY_REPO_URL} | grep -oP '(quay.*)')
+sudo podman pull "${QUAY_REPO_URL_AUX}:${QUAY_REPO_TAG}"
+sudo podman images
+OCP4_IMAGE_ID=$(sudo podman images --format "{{.ID}}")
+sudo podman run -d --name test-ocp4-container --network edge --ip "${STAGE_OCP4_ADDRESS}" "${OCP4_IMAGE_ID}"
+
+# Wait for container to be running
+until [ "$(sudo podman inspect -f '{{.State.Running}}' test-ocp4-container)" == "true" ]; do
+    sleep 1;
+done;
 
 # Sync installer ostree content
 greenprint "Sync ostree repo with stage repo"
 sudo ostree --repo="$PROD_REPO" pull --mirror edge-stage-ocp4 "$OSTREE_REF"
 
-# Clean up OCP4
-greenprint "Clean up OCP4"
-oc delete pod,rc,service,route,dc -l app="${STAGE_OCP4_SERVER_NAME}-${QUAY_REPO_TAG}"
+# # Clean up OCP4
+# greenprint "Clean up OCP4"
+# oc delete pod,rc,service,route,dc -l app="${STAGE_OCP4_SERVER_NAME}-${QUAY_REPO_TAG}"
 
 # Clean compose and blueprints.
 greenprint "🧹 Clean up compose"
@@ -694,6 +708,10 @@ sudo composer-cli blueprints delete container > /dev/null
 greenprint "Remove tag from quay.io repo"
 skopeo delete --creds "${QUAY_USERNAME}:${QUAY_PASSWORD}" "${QUAY_REPO_URL}:${QUAY_REPO_TAG}"
 
+greenprint "Remove OCP4 container and image"
+sudo podman rm -f test-ocp4-container
+sudo podman rmi -f "${OCP4_IMAGE_ID}"
+
 ########################################################
 ##
 ## rhel-edge installer image building from container image