Merge pull request #3578 from sbueringer/pr-cleanup-mirror-prow

🌱 Remove mirror prow handling from scripts

Author: k8s-ci-robot

hack/clean-ci.sh

@@ -18,12 +18,6 @@ set -o errexit  # exits immediately on any unexpected error (does not bypass tra
 set -o nounset  # will error if variables are used without first being defined
 set -o pipefail # any non-zero exit code in a piped command causes the pipeline to fail with that code
 
-# Fallback for mirror-prow.
-if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
-  export JANITOR_ARGS
-  JANITOR_ARGS="--resource-type=vsphere-project-cluster-api-provider --resource-type=vsphere-project-cloud-provider --resource-type=vsphere-project-image-builder"
-fi
-
 # Sanitize input envvars to not contain newline
 GOVC_USERNAME=$(echo "${GOVC_USERNAME}" | tr -d "\n")
 GOVC_PASSWORD=$(echo "${GOVC_PASSWORD}" | tr -d "\n")

hack/e2e.sh

@@ -44,10 +44,6 @@ if [[ "${JOB_NAME}" != "" ]]; then
   export BOSKOS_RESOURCE_OWNER="${JOB_NAME}/${BUILD_ID}"
 fi
 export BOSKOS_RESOURCE_TYPE="gcve-vsphere-project"
-# Fallback for mirror-prow.
-if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
-  BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider
-fi
 
 on_exit() {
   # Only handle Boskos when we have to (not for vcsim)
@@ -129,13 +125,6 @@ ssh-keygen -t ed25519 -f "${VSPHERE_SSH_PRIVATE_KEY}" -N ""
 export VSPHERE_SSH_AUTHORIZED_KEY
 VSPHERE_SSH_AUTHORIZED_KEY="$(cat "${VSPHERE_SSH_PRIVATE_KEY}.pub")"
 
-# Fallback for mirror-prow.
-if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
-  VSPHERE_SSH_AUTHORIZED_KEY="${VM_SSH_PUB_KEY:-}"
-  VSPHERE_SSH_PRIVATE_KEY="/root/ssh/.private-key/private-key"
-  E2E_CONF_OVERRIDE_FILE="$(pwd)/test/e2e/config/config-overrides-mirror-prow.yaml"
-fi
-
 # Ensure vSphere is reachable
 function wait_for_vsphere_reachable() {
   local n=0
@@ -145,7 +134,7 @@ function wait_for_vsphere_reachable() {
       break
     fi
     n=$((n + 1))
-    echo "Failed to reach https://${VSPHERE_SERVER}/sdk. Retrying in 1s ($n/30)"
+    echo "Failed to reach https://${VSPHERE_SERVER}/sdk. Retrying in 1s ($n/300)"
     sleep 1
   done
   if [ "$RET" -ne 0 ]; then