geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhough...@apache.org
Subject [geode] branch develop updated: GEODE-6757: fix input gating for meta
Date Thu, 09 May 2019 17:09:27 GMT
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 c63097d  GEODE-6757: fix input gating for meta
c63097d is described below

commit c63097da2159e6e40ae5aff485ea5143fd53148f
Author: Robert Houghton <rhoughton@pivotal.io>
AuthorDate: Wed May 8 13:28:10 2019 -0700

    GEODE-6757: fix input gating for meta
    
    Jobs use the image created in the same pipeline directly and trigger
    as-needed without manual intervention
    
    Authored-by: Robert Houghton <rhoughton@pivotal.io>
---
 ci/pipelines/meta/deploy_meta.sh     |  5 ++--
 ci/pipelines/meta/jinja.template.yml | 55 +++++++++++++-----------------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index 49d7682..bb64de9 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -237,11 +237,11 @@ set +x
 
 if [[ "${GEODE_FORK}" != "${UPSTREAM_FORK}" ]]; then
   echo "Disabling unnecessary jobs for forks."
-  pauseJobs ${META_PIPELINE} set-images-pipeline set-reaper-pipeline
+  pauseJobs ${META_PIPELINE} set-reaper-pipeline
   pauseNewJobs ${META_PIPELINE} set-metrics-pipeline
 elif [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]] && [[ "$GEODE_BRANCH" == "develop"
]]; then
   echo "Disabling optional jobs for develop"
-  pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-images-pipeline set-metrics-pipeline
set-examples-pipeline
+  pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline
 else
   echo "Disabling unnecessary jobs for release branches."
   echo "*** DO NOT RE-ENABLE THESE META-JOBS ***"
@@ -249,7 +249,6 @@ else
   pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline
 fi
 
-pauseNewJobs ${META_PIPELINE} set-pipeline
 unpausePipeline ${META_PIPELINE}
 driveToGreen $META_PIPELINE build-meta-mini-docker-image
 driveToGreen $META_PIPELINE set-images-pipeline
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index b8357e6..4d680a6 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -108,16 +108,13 @@ jobs:
   plan:
   - get: geode-images-pipeline
     trigger: true
+  - get: meta-mini-image
+    trigger: true
+    passed: [build-meta-mini-docker-image]
   - task: create-image-yml
+    image: meta-mini-image
     config:
       platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          username: ((!docker-username))
-          password: ((!docker-password))
-          tag: latest
-          repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
       inputs:
       - name: geode-images-pipeline
       outputs:
@@ -151,16 +148,13 @@ jobs:
   plan:
   - get: geode-pipeline
     trigger: true
+  - get: meta-mini-image
+    trigger: true
+    passed: [set-images-pipeline]
   - task: create-geode-pipeline-yml
+    image: meta-mini-image
     config:
       platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          username: ((!docker-username))
-          password: ((!docker-password))
-          tag: latest
-          repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
       inputs:
       - name: geode-pipeline
       outputs:
@@ -200,16 +194,13 @@ jobs:
   plan:
   - get: geode-examples-pipeline
     trigger: true
+  - get: meta-mini-image
+    trigger: true
+    passed: [build-meta-mini-docker-image]
   - task: deploy-build
+    image: meta-mini-image
     config:
       platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          username: ((!docker-username))
-          password: ((!docker-password))
-          tag: latest
-          repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
       inputs:
         - name: geode-examples-pipeline
       outputs:
@@ -245,16 +236,13 @@ jobs:
   plan:
   - get: geode-pr-pipeline
     trigger: true
+  - get: meta-mini-image
+    trigger: true
+    passed: [build-meta-mini-docker-image]
   - task: deploy-pr
+    image: meta-mini-image
     config:
       platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          username: ((!docker-username))
-          password: ((!docker-password))
-          tag: latest
-          repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
       inputs:
         - name: geode-pr-pipeline
       outputs:
@@ -290,16 +278,13 @@ jobs:
   plan:
   - get: geode-metrics-pipeline
     trigger: true
+  - get: meta-mini-image
+    trigger: true
+    passed: [build-meta-mini-docker-image]
   - task: create-metrics-pipeline-yml
+    image: meta-mini-image
     config:
       platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          username: ((!docker-username))
-          password: ((!docker-password))
-          tag: latest
-          repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
       inputs:
       - name: geode-metrics-pipeline
       outputs:


Mime
View raw message