You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/11/10 00:03:08 UTC
[geode] 01/02: Add required pipeline path dependencies (#7096)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 15d974c3fa99f06ed3767394de0ef7cd551d46f8
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Tue Nov 9 11:07:30 2021 -0800
Add required pipeline path dependencies (#7096)
(cherry picked from commit e34147710bd942594fe5b886289a148eea74757e)
---
ci/pipelines/meta/deploy_meta.sh | 8 +++-----
ci/pipelines/meta/jinja.template.yml | 6 ++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index f6a46c4..9db9513 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -70,10 +70,8 @@ fi
set -e
set -x
-if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
- CONCOURSE_SCHEME=https
-fi
-CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
+CONCOURSE_SCHEME=https
+CONCOURSE_URL=${CONCOURSE_SCHEME}://${CONCOURSE_HOST}
FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
. ${SCRIPTDIR}/../shared/utilities.sh
@@ -133,7 +131,7 @@ YML
FLY=${FLY:-$(which fly)}
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
${FLY} -t ${FLY_TARGET} status || \
${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 8be8b3d..6f1116f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -46,14 +46,16 @@ resources:
branch: ((geode-build-branch))
paths:
- ci/pipelines/reaper/*
+ - ci/pipelines/render.py
- name: geode-mass-test-run-pipeline
type: git
source:
{{ github_access() | indent(4) }}
branch: ((geode-build-branch))
paths:
- - ci/pipelines/mass-test-run/*
- - ci/pipelines/shared/*
+ - ci/pipelines/mass-test-run/*
+ - ci/pipelines/shared/*
+ - ci/pipelines/render.py
- name: meta-mini-dockerfile
type: git
source: