GEODE-6091: Pass same environment to main CI as to pull-requests. (ap…

…ache#2895)

* GEODE-6091: Pass same environment to main CI as to pull-requests.

* Go the other direction: remove UPSTREAM_FORK variable from main, pull-request pipelines.  Always use prefixed image family.

ci/pipelines/pull-request/jinja.template.yml

@@ -94,7 +94,6 @@ jobs:
               CPUS: {{test.CPUS}}
               GEODE_BRANCH: {{repository.branch}}
               GEODE_FORK: {{repository.fork}}
-              UPSTREAM_FORK: ((upstream-fork))
               GCP_PROJECT: ((gcp-project))
               RAM: {{test.RAM}}
               JAVA_BUILD_VERSION: {{ java_build_version.version }}

ci/scripts/create_instance.sh

@@ -51,12 +51,9 @@ SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
 SANITIZED_BUILD_PIPELINE_NAME=$(sanitizeName ${BUILD_PIPELINE_NAME})
 SANITIZED_BUILD_JOB_NAME=$(sanitizeName ${BUILD_JOB_NAME})
 SANITIZED_BUILD_NAME=$(sanitizeName ${BUILD_NAME})
-IMAGE_FAMILY_PREFIX=""
+IMAGE_FAMILY_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
 WINDOWS_PREFIX=""
 
-if [[ "${SANITIZED_GEODE_FORK}" != "${UPSTREAM_FORK}" ]]; then
-  IMAGE_FAMILY_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
-fi
 
 if [[ "${SANITIZED_BUILD_JOB_NAME}" =~ [Ww]indows ]]; then
   WINDOWS_PREFIX="windows-"