Cleanup

Author: pawanpinjarkar

agent/cleanup.sh

@@ -29,10 +29,6 @@ if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "DISKIMAGE" ]]; then
     sudo podman rmi -f ${APPLIANCE_IMAGE} || true
 fi
 
-if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]]; then
-    sudo rm -rf "${OCP_DIR}/iso_builder"
-fi
-
 if [[ -d ${BOOT_SERVER_DIR} ]]; then
    sudo pkill agentpxeserver || true
    rm -rf ${BOOT_SERVER_DIR}

ocp_cleanup.sh

@@ -15,7 +15,11 @@ fi
 if [ -d ${OCP_DIR} ]; then
     ${OCP_DIR}/openshift-install --dir ${OCP_DIR} --log-level=debug destroy bootstrap
     ${OCP_DIR}/openshift-install --dir ${OCP_DIR} --log-level=debug destroy cluster
-    rm -rf ${OCP_DIR}
+    if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]]; then
+      sudo rm -rf "${OCP_DIR}"
+    else
+      rm -rf ${OCP_DIR}
+    fi
 fi
 
 sudo rm -rf /etc/NetworkManager/dnsmasq.d/openshift-${CLUSTER_NAME}.conf