Skip to content

Commit 14294e5

Browse files
committed
Remove mirror prow handling from scripts
Signed-off-by: Stefan Büringer [email protected]
1 parent ade4688 commit 14294e5

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

hack/clean-ci.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ set -o errexit # exits immediately on any unexpected error (does not bypass tra
1818
set -o nounset # will error if variables are used without first being defined
1919
set -o pipefail # any non-zero exit code in a piped command causes the pipeline to fail with that code
2020

21-
# Fallback for mirror-prow.
22-
if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
23-
export JANITOR_ARGS
24-
JANITOR_ARGS="--resource-type=vsphere-project-cluster-api-provider --resource-type=vsphere-project-cloud-provider --resource-type=vsphere-project-image-builder"
25-
fi
26-
2721
# Sanitize input envvars to not contain newline
2822
GOVC_USERNAME=$(echo "${GOVC_USERNAME}" | tr -d "\n")
2923
GOVC_PASSWORD=$(echo "${GOVC_PASSWORD}" | tr -d "\n")

hack/e2e.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ if [[ "${JOB_NAME}" != "" ]]; then
4444
export BOSKOS_RESOURCE_OWNER="${JOB_NAME}/${BUILD_ID}"
4545
fi
4646
export BOSKOS_RESOURCE_TYPE="gcve-vsphere-project"
47-
# Fallback for mirror-prow.
48-
if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
49-
BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider
50-
fi
5147

5248
on_exit() {
5349
# Only handle Boskos when we have to (not for vcsim)
@@ -129,13 +125,6 @@ ssh-keygen -t ed25519 -f "${VSPHERE_SSH_PRIVATE_KEY}" -N ""
129125
export VSPHERE_SSH_AUTHORIZED_KEY
130126
VSPHERE_SSH_AUTHORIZED_KEY="$(cat "${VSPHERE_SSH_PRIVATE_KEY}.pub")"
131127

132-
# Fallback for mirror-prow.
133-
if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
134-
VSPHERE_SSH_AUTHORIZED_KEY="${VM_SSH_PUB_KEY:-}"
135-
VSPHERE_SSH_PRIVATE_KEY="/root/ssh/.private-key/private-key"
136-
E2E_CONF_OVERRIDE_FILE="$(pwd)/test/e2e/config/config-overrides-mirror-prow.yaml"
137-
fi
138-
139128
# Ensure vSphere is reachable
140129
function wait_for_vsphere_reachable() {
141130
local n=0

0 commit comments

Comments
 (0)