[geode] branch develop updated: GEODE-7047: fix deploy script to not give error

[onichols]

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

onichols 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 1faca0e  GEODE-7047: fix deploy script to not give error
1faca0e is described below

commit 1faca0e8e0deac1d23336abcd895927447addf77
Author: Owen Nichols <onich...@pivotal.io>
AuthorDate: Mon Aug 5 18:47:12 2019 -0700

    GEODE-7047: fix deploy script to not give error
    
    [skip ci]
---
 ci/pipelines/meta/deploy_meta.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index 803893e..3622e6d 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -232,6 +232,13 @@ function driveToGreen {
   fi
 }
 
+function enableFeature {
+  NAME=$1
+  driveToGreen $META_PIPELINE set-$NAME-pipeline
+  unpausePipeline ${PIPELINE_PREFIX}$NAME
+  exposePipeline ${PIPELINE_PREFIX}$NAME
+}
+
 set -e
 set +x
 
@@ -257,14 +264,14 @@ driveToGreen ${PIPELINE_PREFIX}images 
build-google-geode-builder
 driveToGreen ${PIPELINE_PREFIX}images build-google-windows-geode-builder
 driveToGreen $META_PIPELINE set-pipeline
 unpausePipeline ${PIPELINE_PREFIX}main
-echo "Successfully deployed 
${CONCOURSE_URL}/teams/main/pipelines/${PIPELINE_PREFIX}main"
 
 if [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]]; then
-  unpauseJobs set-metrics-pipeline
-  driveToGreen $META_PIPELINE set-metrics-pipeline
-  exposePipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}metrics 
${PIPELINE_PREFIX}images
+  exposePipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}images
+  enableFeature metrics
+  enableFeature examples
   if [[ "$GEODE_BRANCH" == "develop" ]]; then
-    unpauseJobs set-pr-pipeline set-examples-pipeline
-    exposePipelines ${PIPELINE_PREFIX}pr ${PIPELINE_PREFIX}examples
+    enableFeature pr
   fi
 fi
+
+echo "Successfully deployed 
${CONCOURSE_URL}/teams/main/pipelines/${PIPELINE_PREFIX}main"