[geode] branch develop updated: GEODE-5584: Fixes image path on PR

[jb...@apache.org]

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

jbarrett 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 4ae9798  GEODE-5584: Fixes image path on PR
4ae9798 is described below

commit 4ae979875a6764356b4ed7db608d883376b365b4
Author: Finn Southerland <fs...@pivotal.io>
AuthorDate: Wed Aug 15 11:52:20 2018 -0700

    GEODE-5584: Fixes image path on PR
    
    Co-authored-by: Finn Southerland <fs...@pivotal.io>
    Co-authored-by: Jake Barrett <bj...@pivotal.io>
---
 ci/pipelines/shared_jinja.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ci/pipelines/shared_jinja.yml b/ci/pipelines/shared_jinja.yml
index 9bdf192..680c8f0 100644
--- a/ci/pipelines/shared_jinja.yml
+++ b/ci/pipelines/shared_jinja.yml
@@ -19,6 +19,14 @@
 {{- docker_config() }}
 {%- endmacro %}
 
+
+{%- macro pipeline_prefix() %}
+{%- if repository.fork=="apache" %}
+{%- else %}
+{{repository.fork}}-{{repository.branch}}-
+{%- endif %}
+{%- endmacro %}
+
 {%- macro docker_config(repository_url) %}
 config:
   platform: linux
@@ -27,13 +35,6 @@ config:
     source:
       username: ((!docker-username))
       password: ((!docker-password))
-      repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-alpine-tools
+      repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}-alpine-tools
       tag: latest
 {%- endmacro %}
-
-{%- macro pipeline_prefix() %}
-{%- if repository.fork=="apache" %}
-{%- else %}
-{{repository.fork}}-{{repository.branch}}-
-{%- endif %}
-{%- endmacro %}