[geode] branch develop updated: GEODE-6091: Pass same environment to main CI as to pull-requests. (#2895)

[rhoughton]

This is an automated email from the ASF dual-hosted git repository.

rhoughton pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8e3cbbe  GEODE-6091: Pass same environment to main CI as to 
pull-requests. (#2895)
8e3cbbe is described below

commit 8e3cbbe5e4465b21cb22393350460d4afbbb1181
Author: Patrick Rhomberg <prhomb...@pivotal.io>
AuthorDate: Mon Nov 26 11:11:49 2018 -0800

    GEODE-6091: Pass same environment to main CI as to pull-requests. (#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 | 1 -
 ci/scripts/create_instance.sh                | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/pipelines/pull-request/jinja.template.yml 
b/ci/pipelines/pull-request/jinja.template.yml
index 285aded..bde3b26 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/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 }}
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index c05d28b..28ef774 100755
--- a/ci/scripts/create_instance.sh
+++ b/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-"