[geode] branch release/1.11.0 updated: Bala's CI fix 'Add concourse team specific fly targets.'

[on...@apache.org]

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

onichols pushed a commit to branch release/1.11.0
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/release/1.11.0 by this push:
     new f3cffd0  Bala's CI fix 'Add concourse team specific fly targets.'
f3cffd0 is described below

commit f3cffd0b6307cafb321e592708d94be104e957bb
Author: Owen Nichols <on...@pivotal.io>
AuthorDate: Mon Dec 16 11:41:15 2019 -0800

    Bala's CI fix 'Add concourse team specific fly targets.'
---
 ci/pipelines/meta/deploy_meta.sh                | 15 ++++++++++-----
 ci/pipelines/meta/destroy_pipelines.sh          |  2 +-
 ci/pipelines/metrics/deploy_metrics_pipeline.sh |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index ed7aa65..dee7f84 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -74,7 +74,7 @@ if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
   CONCOURSE_SCHEME=https
 fi
 CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
-FLY_TARGET=${CONCOURSE_HOST}
+FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
 
 . ${SCRIPTDIR}/../shared/utilities.sh
 SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
@@ -103,13 +103,19 @@ YML
 
   python3 ../render.py jinja.template.yml --variable-file ../shared/jinja.variables.yml repository.yml --environment ../shared/ --output ${SCRIPTDIR}/generated-pipeline.yml --debug || exit 1
 
-  set -e
+  if [[ ${UPSTREAM_FORK} != "apache" ]]; then
+    fly -t ${FLY_TARGET} status || \
+    fly -t ${FLY_TARGET} login \
+      --team-name ${CONCOURSE_TEAM} \
+      --concourse-url=${CONCOURSE_URL}
+  fi
+
   fly -t ${FLY_TARGET} sync
   fly -t ${FLY_TARGET} set-pipeline \
     -p ${META_PIPELINE} \
     --config ${SCRIPTDIR}/generated-pipeline.yml \
     --var artifact-bucket=${ARTIFACT_BUCKET} \
-    --var concourse-team=main \
+    --var concourse-team=${CONCOURSE_TEAM} \
     --var concourse-url=${CONCOURSE_URL} \
     --var gcp-project=${GCP_PROJECT} \
     --var geode-build-branch=${GEODE_BRANCH} \
@@ -123,9 +129,8 @@ YML
     --var semver-prerelease-token="${SEMVER_PRERELEASE_TOKEN}" \
     --var upstream-fork=${UPSTREAM_FORK} \
     --yaml-var public-pipelines=${PUBLIC}
-    set +e
-popd 2>&1 > /dev/null
 
+popd 2>&1 > /dev/null
 
 # bootstrap all precursors of the actual Build job
 
diff --git a/ci/pipelines/meta/destroy_pipelines.sh b/ci/pipelines/meta/destroy_pipelines.sh
index 60b88674..e8125d0 100755
--- a/ci/pipelines/meta/destroy_pipelines.sh
+++ b/ci/pipelines/meta/destroy_pipelines.sh
@@ -63,7 +63,7 @@ if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
   CONCOURSE_SCHEME=https
 fi
 CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
-FLY_TARGET=${CONCOURSE_HOST}
+FLY_TARGET=${CONCOURSE_HOST}-{CONCOURSE_TEAM}
 
 . ${SCRIPTDIR}/../shared/utilities.sh
 SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
diff --git a/ci/pipelines/metrics/deploy_metrics_pipeline.sh b/ci/pipelines/metrics/deploy_metrics_pipeline.sh
index bb8409e..1aa3720 100755
--- a/ci/pipelines/metrics/deploy_metrics_pipeline.sh
+++ b/ci/pipelines/metrics/deploy_metrics_pipeline.sh
@@ -72,6 +72,8 @@ pipeline-prefix: "${PIPELINE_PREFIX}"
 public-pipelines: ${PUBLIC_PIPELINES}
 gcp-project: ${GCP_PROJECT}
 concourse-url: ${CONCOURSE_URL}
+concourse-team: ${CONCOURSE_TEAM}
+fly-target: ${CONCOURSE_HOST}-${CONCOURSE_TEAM}
 YML