You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/08/15 18:37:01 UTC
[geode] branch develop updated: GEODE-5584: Fixes pipeline prefix.
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 425debc GEODE-5584: Fixes pipeline prefix.
425debc is described below
commit 425debc3cbdd87e32dcbc8a87e4e0b22d2a93f87
Author: Finn Southerland <fs...@pivotal.io>
AuthorDate: Wed Aug 15 11:36:34 2018 -0700
GEODE-5584: Fixes pipeline prefix.
Co-authored-by: Finn Southerland <fs...@pivotal.io>
Co-authored-by: Jake Barrett <bj...@pivotal.io>
---
ci/pipelines/geode-build/jinja.template.yml | 8 +++++---
ci/pipelines/pull-request/jinja.template.yml | 5 +++--
ci/pipelines/shared_jinja.yml | 7 +++++++
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index aa4056f..fd172c9 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -16,6 +16,7 @@
#
{% from 'shared_jinja.yml' import alpine_tools_config with context %}
+{% from 'shared_jinja.yml' import pipeline_prefix with context %}
{% macro plan_resource_gets() %}
- get: geode-ci
@@ -72,7 +73,7 @@ resources:
type: docker-image
source:
password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-((!docker-image-name))
+ repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}((!docker-image-name))
tag: latest
username: ((!docker-username))
- name: geode
@@ -106,7 +107,7 @@ resource_types:
type: docker-image
source:
password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-concourse-metadata-resource
+ repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}concourse-metadata-resource
tag: latest
username: ((!docker-username))
- name: gcs-resource
@@ -136,7 +137,7 @@ jobs:
type: docker-image
source:
password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-((!docker-image-name))
+ repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}((!docker-image-name))
tag: latest
username: ((!docker-username))
params:
@@ -283,6 +284,7 @@ jobs:
{% for test in windowstests %}
- name: {{test.name}}Test
public: true
+ serial: true
plan:
{{ plan_resource_gets() |indent(2) }}
- task: cleanup-java-processes
diff --git a/ci/pipelines/pull-request/jinja.template.yml b/ci/pipelines/pull-request/jinja.template.yml
index 860cdec..9652dbd 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -16,6 +16,7 @@
#
{% from 'shared_jinja.yml' import alpine_tools_config with context %}
+{% from 'shared_jinja.yml' import pipeline_prefix with context %}
groups:
- name: main
@@ -29,7 +30,7 @@ resources:
type: docker-image
source:
password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-((!docker-image-name))
+ repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}((!docker-image-name))
tag: latest
username: ((!docker-username))
- name: geode
@@ -66,7 +67,7 @@ resource_types:
type: docker-image
source:
password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-concourse-metadata-resource
+ repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}concourse-metadata-resource
tag: latest
username: ((!docker-username))
jobs:
diff --git a/ci/pipelines/shared_jinja.yml b/ci/pipelines/shared_jinja.yml
index 3aff042..9bdf192 100644
--- a/ci/pipelines/shared_jinja.yml
+++ b/ci/pipelines/shared_jinja.yml
@@ -30,3 +30,10 @@ config:
repository: gcr.io/apachegeode-ci/{{repository.fork}}-{{repository.branch}}-alpine-tools
tag: latest
{%- endmacro %}
+
+{%- macro pipeline_prefix() %}
+{%- if repository.fork=="apache" %}
+{%- else %}
+{{repository.fork}}-{{repository.branch}}-
+{%- endif %}
+{%- endmacro %}