diff --git a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh index 37843f4e8686f..9bed025f17567 100755 --- a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh +++ b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh @@ -8,7 +8,7 @@ CONFIG="${SHARED_DIR}/install-config.yaml" GCP_BASE_DOMAIN="origin-ci-int-gce.dev.openshift.com" GCP_PROJECT="openshift-gce-devel-ci" -GCP_REGION="us-east1" +GCP_REGION="${LEASED_RESOURCE}" cat >> "${CONFIG}" << EOF baseDomain: ${GCP_BASE_DOMAIN} diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh old mode 100644 new mode 100755 index 05d1a1b0ce361..329fcbd45c70c --- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh @@ -43,7 +43,9 @@ gcp) export KUBE_SSH_USER=core mkdir -p ~/.ssh cp "${CLUSTER_PROFILE_DIR}/ssh-privatekey" ~/.ssh/google_compute_engine || true - export TEST_PROVIDER='{"type":"gce","region":"us-east1","multizone": true,"multimaster":true,"projectid":"openshift-gce-devel-ci"}' + # TODO: make openshift-tests auto-discover this from cluster config + REGION="$(oc get -o jsonpath='{.status.platformStatus.gcp.region}' infrastructure cluster)" + export TEST_PROVIDER="{\"type\":\"gce\",\"region\":\"${REGION}\",\"multizone\": true,\"multimaster\":true,\"projectid\":\"openshift-gce-devel-ci\"}" ;; aws) mkdir -p ~/.ssh