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/08 21:55:32 UTC
[geode] branch develop updated: [GEODE-5545] Use develop branch for
executing scripts.
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 ac2e14a [GEODE-5545] Use develop branch for executing scripts.
ac2e14a is described below
commit ac2e14ad964d3eb2c7f8c0f8914ac8700b2d6225
Author: Finn Southerland <fs...@pivotal.io>
AuthorDate: Wed Aug 8 14:50:23 2018 -0700
[GEODE-5545] Use develop branch for executing scripts.
Signed-off-by: Sean Goller <sg...@pivotal.io>
---
ci/pipelines/pull-request/base.yml | 13 ++++++++++-
ci/pipelines/pull-request/pr-template.yml | 36 +++++++++++++++++++------------
2 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/ci/pipelines/pull-request/base.yml b/ci/pipelines/pull-request/base.yml
index aa1c726..ae65c57 100644
--- a/ci/pipelines/pull-request/base.yml
+++ b/ci/pipelines/pull-request/base.yml
@@ -51,6 +51,15 @@ resources:
ignore_paths:
- geode-docs/*
- geode-book/*
+- name: geode-ci
+ type: git
+ source:
+ depth: 1
+ uri: https://github.com/apache/geode.git
+ branch: develop
+ paths:
+ - ci/pipelines/geode-build/*
+ - ci/scripts/*
- name: concourse-metadata-resource
type: concourse-metadata-resource
@@ -76,6 +85,7 @@ jobs:
fetch_merge: true
git:
depth: 100
+ - get: geode-ci
- get: docker-geode-build-image
params:
rootfs: true
@@ -98,6 +108,7 @@ jobs:
platform: linux
inputs:
- name: geode
+ - name: geode-ci
outputs:
- name: built-geode
- name: results
@@ -106,7 +117,7 @@ jobs:
SERVICE_ACCOUNT: ((!concourse-gcp-account))
PUBLIC_BUCKET: ((!public-bucket))
run:
- path: geode/ci/scripts/build.sh
+ path: geode-ci/ci/scripts/build.sh
on_failure:
aggregate:
- put: geode
diff --git a/ci/pipelines/pull-request/pr-template.yml b/ci/pipelines/pull-request/pr-template.yml
index 18d1e41..8e85457 100644
--- a/ci/pipelines/pull-request/pr-template.yml
+++ b/ci/pipelines/pull-request/pr-template.yml
@@ -30,14 +30,16 @@ jobs:
public: true
plan:
- do:
- # Merged pull request SHA, for building
- - get: geode
- trigger: true
- version: every
- params:
- fetch_merge: true
- git:
- depth: 100
+ - aggregate:
+ # Merged pull request SHA, for building
+ - get: geode
+ trigger: true
+ version: every
+ params:
+ fetch_merge: true
+ git:
+ depth: 100
+ - get: geode-ci
- aggregate:
# Unmerged pull request SHA, for writing status into GitHub
- do:
@@ -62,6 +64,7 @@ jobs:
inputs:
- name: concourse-metadata-resource
- name: geode
+ - name: geode-ci
outputs:
- name: instance-data
platform: linux
@@ -72,22 +75,24 @@ jobs:
GEODE_BRANCH: (( grab metadata.geode-build-branch ))
GEODE_FORK: (( grab metadata.geode-fork ))
run:
- path: geode/ci/scripts/start_instance.sh
+ path: geode-ci/ci/scripts/start_instance.sh
- task: rsync_code_up
timeout: 5m
config:
inputs:
- name: geode
+ - name: geode-ci
- name: instance-data
platform: linux
image_resource: *alpine-tools-image
run:
- path: geode/ci/scripts/rsync_code_up.sh
+ path: geode-ci/ci/scripts/rsync_code_up.sh
- task: execute_tests
timeout: (( grab metadata.job.timeout ))
config:
inputs:
- name: geode
+ - name: geode-ci
- name: instance-data
platform: linux
image_resource: *alpine-tools-image
@@ -102,7 +107,7 @@ jobs:
GRADLE_TASK_OPTIONS: (( grab metadata.job.gradle_task_options || "" ))
ARTIFACT_SLUG: (( grab metadata.job.artifact_slug ))
run:
- path: geode/ci/scripts/execute_tests.sh
+ path: geode-ci/ci/scripts/execute_tests.sh
on_success:
do:
- put: pull-request-job-success
@@ -126,13 +131,14 @@ jobs:
config:
inputs:
- name: geode
+ - name: geode-ci
- name: instance-data
outputs:
- name: geode-results
platform: linux
image_resource: *alpine-tools-image
run:
- path: geode/ci/scripts/rsync_code_down.sh
+ path: geode-ci/ci/scripts/rsync_code_down.sh
ensure:
aggregate:
- task: archive-results
@@ -140,6 +146,7 @@ jobs:
inputs:
- name: concourse-metadata-resource
- name: geode
+ - name: geode-ci
- name: geode-results
platform: linux
image_resource: *alpine-tools-image
@@ -150,15 +157,16 @@ jobs:
GRADLE_TASK: (( grab metadata.job.gradle_task ))
ARTIFACT_SLUG: (( grab metadata.job.artifact_slug ))
run:
- path: geode/ci/scripts/archive_results.sh
+ path: geode-ci/ci/scripts/archive_results.sh
- task: stop_instance
timeout: 1h
config:
inputs:
- name: geode
+ - name: geode-ci
- name: instance-data
platform: linux
image_resource: *alpine-tools-image
run:
- path: geode/ci/scripts/stop_instance.sh
+ path: geode-ci/ci/scripts/stop_instance.sh