You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2018/09/06 23:14:11 UTC
[geode] branch develop updated: GEODE-5687 - Improve pipeline
deployment for forks.
This is an automated email from the ASF dual-hosted git repository.
abaker 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 e665f42 GEODE-5687 - Improve pipeline deployment for forks.
e665f42 is described below
commit e665f42140d416ad42fcef6bf856a5163ceb85ff
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Tue Sep 4 15:19:55 2018 -0700
GEODE-5687 - Improve pipeline deployment for forks.
* Use jinja templating with meta pipeline deployment.
* Remove unnecessary jobs from deployed pipelines for forks.
* Move meta pipeline into its own subdirectory.
---
ci/images/google-geode-builder/build_image.sh | 8 +-
ci/pipelines/clean_fork_pipelines.sh | 16 +++-
ci/pipelines/examples/deploy_pipeline.sh | 6 --
ci/pipelines/geode-build/deploy_pipeline.sh | 6 --
ci/pipelines/geode-build/jinja.template.yml | 7 +-
ci/pipelines/images/deploy_images_pipeline.sh | 14 ++--
ci/pipelines/{ => meta}/deploy_meta.sh | 55 +++++++-----
ci/pipelines/{meta.yml => meta/jinja.template.yml} | 98 +++++++++++-----------
ci/pipelines/pull-request/deploy_pr_pipeline.sh | 6 +-
ci/pipelines/shared/utilities.sh | 4 +-
10 files changed, 116 insertions(+), 104 deletions(-)
diff --git a/ci/images/google-geode-builder/build_image.sh b/ci/images/google-geode-builder/build_image.sh
index 6cdf219..cd12714 100755
--- a/ci/images/google-geode-builder/build_image.sh
+++ b/ci/images/google-geode-builder/build_image.sh
@@ -26,6 +26,9 @@ SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
pushd ${SCRIPTDIR}
+. ${SCRIPTDIR}/../../pipelines/shared/utilities.sh
+
+
IMAGE_FAMILY_PREFIX=""
GEODE_DOCKER_IMAGE=${GEODE_DOCKER_IMAGE:-"gcr.io/apachegeode-ci/test-container"}
if [[ -z "${GEODE_FORK}" ]]; then
@@ -34,8 +37,9 @@ if [[ -z "${GEODE_FORK}" ]]; then
fi
GEODE_BRANCH=${GEODE_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}
-SANITIZED_GEODE_BRANCH=$(echo ${GEODE_BRANCH} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-20)
-SANITIZED_GEODE_FORK=$(echo ${GEODE_FORK} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-16)
+
+SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
+SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
if [[ "${SANITIZED_GEODE_FORK}" != "apache" ]]; then
IMAGE_FAMILY_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
diff --git a/ci/pipelines/clean_fork_pipelines.sh b/ci/pipelines/clean_fork_pipelines.sh
index 1a19443..7d7716e 100755
--- a/ci/pipelines/clean_fork_pipelines.sh
+++ b/ci/pipelines/clean_fork_pipelines.sh
@@ -14,23 +14,33 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
TARGET=geode
GEODE_FORK=${1}
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
GEODE_BRANCH=${2:-${CURRENT_BRANCH}}
-. ${SCRIPTDIR}/../shared/utilities.sh
+. ${SCRIPTDIR}/shared/utilities.sh
SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
-TEAM=$(fly targets | grep ^${TARGET} | awk '{print $3}')
-
if [[ -z "${GEODE_FORK}" ]]; then
echo "No fork provided!"
exit 1
fi
+if [[ "${GEODE_FORK}" == "apache" ]]; then
+ echo "This utility is not for primary pipelines."
+ exit 1
+fi
+
echo "Fork is ${GEODE_FORK}"
echo "Branch is ${GEODE_BRANCH}"
diff --git a/ci/pipelines/examples/deploy_pipeline.sh b/ci/pipelines/examples/deploy_pipeline.sh
index bb560a3..c6df1d1 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -60,11 +60,6 @@ PATH=${PATH}:${BIN_DIR}
TARGET="geode"
-TEAM="staging"
-if [[ "${GEODE_BRANCH}" == "develop" ]] || [[ ${GEODE_BRANCH} =~ ^release/* ]]; then
- TEAM="main"
-fi
-
if [[ "${SANITIZED_GEODE_FORK}" == "apache" ]]; then
PIPELINE_NAME=${SANITIZED_GEODE_BRANCH}
DOCKER_IMAGE_PREFIX=""
@@ -79,7 +74,6 @@ pushd ${SCRIPTDIR} 2>&1 > /dev/null
python3 ../render.py $(basename ${SCRIPTDIR}) || exit 1
fly login -t ${TARGET} \
- -n ${TEAM} \
-c https://concourse.apachegeode-ci.info \
-u ${CONCOURSE_USERNAME} \
-p ${CONCOURSE_PASSWORD}
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh b/ci/pipelines/geode-build/deploy_pipeline.sh
index 49aadfe..6623a9f 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -59,11 +59,6 @@ PATH=${PATH}:${BIN_DIR}
TARGET="geode"
-TEAM="staging"
-if [[ "${GEODE_BRANCH}" == "develop" ]] || [[ ${GEODE_BRANCH} =~ ^release/* ]]; then
- TEAM="main"
-fi
-
if [[ "${SANITIZED_GEODE_FORK}" == "apache" ]]; then
PIPELINE_NAME=${SANITIZED_GEODE_BRANCH}
DOCKER_IMAGE_PREFIX=""
@@ -79,7 +74,6 @@ pushd ${SCRIPTDIR} 2>&1 > /dev/null
grep -n . generated-pipeline.yml
fly login -t ${TARGET} \
- -n ${TEAM} \
-c https://concourse.apachegeode-ci.info \
-u ${CONCOURSE_USERNAME} \
-p ${CONCOURSE_PASSWORD}
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index c0459e8..2617ac5 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -47,8 +47,10 @@ groups:
{% for test in (tests) if not test.name=="StressNew" -%}
- {{test.name}}Test
{% endfor -%}
+{% if repository.sanitized_fork == "apache" %}
- UpdatePassingRef
- PublishArtifacts
+{% endif %}
- name: windows
jobs:
- {{ build_test.name }}
@@ -71,6 +73,7 @@ resources:
- name: concourse-metadata-resource
type: concourse-metadata-resource
source: {}
+{% if repository.sanitized_fork == "apache" %}
- name: docker-geode-build-image
type: docker-image
source:
@@ -78,6 +81,7 @@ resources:
repository: gcr.io/apachegeode-ci/{{ pipeline_prefix() }}((!docker-image-name))
tag: latest
username: ((!docker-username))
+{% endif %}
- name: geode
type: git
source:
@@ -225,6 +229,7 @@ jobs:
- name: instance-data
timeout: 1h
+{% if repository.sanitized_fork == "apache" %}
- name: UpdatePassingRef
public: true
serial: true
@@ -252,7 +257,6 @@ jobs:
- name: geode-ci
outputs:
- name: results
-
- name: PublishArtifacts
public: true
plan:
@@ -286,6 +290,7 @@ jobs:
- name: geode
- name: geode-ci
- name: geode-build-version
+{% endif %}
{% for test in tests if not test.name=="StressNew" %}
- name: {{test.name}}Test
diff --git a/ci/pipelines/images/deploy_images_pipeline.sh b/ci/pipelines/images/deploy_images_pipeline.sh
index b7f8f4d..3b7baa8 100755
--- a/ci/pipelines/images/deploy_images_pipeline.sh
+++ b/ci/pipelines/images/deploy_images_pipeline.sh
@@ -42,6 +42,9 @@ fi
SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
+echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
+echo "Sanitized Goede Branch = ${SANITIZED_GEODE_BRANCH}"
+
BIN_DIR=${OUTPUT_DIRECTORY}/bin
TMP_DIR=${OUTPUT_DIRECTORY}/tmp
mkdir -p ${BIN_DIR} ${TMP_DIR}
@@ -52,8 +55,6 @@ PATH=${PATH}:${BIN_DIR}
TARGET="geode"
-TEAM=${CONCOURSE_TEAM}
-
if [[ "${SANITIZED_GEODE_FORK}" == "apache" ]]; then
PIPELINE_PREFIX=""
DOCKER_IMAGE_PREFIX=""
@@ -64,17 +65,16 @@ fi
PIPELINE_NAME="${PIPELINE_PREFIX}images"
-#if [[ "${GEODE_BRANCH}" == "develop" ]] || [[ ${GEODE_BRANCH} =~ ^release/* ]]; then
-# TEAM="main"
-#fi
+#echo "DEBUG INFO *****************************"
+#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
+#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
-fly login -t ${TARGET} -n ${TEAM} -c https://concourse.apachegeode-ci.info -u ${CONCOURSE_USERNAME} -p ${CONCOURSE_PASSWORD}
+fly login -t ${TARGET} -c https://concourse.apachegeode-ci.info -u ${CONCOURSE_USERNAME} -p ${CONCOURSE_PASSWORD}
set -x
fly -t ${TARGET} set-pipeline \
--non-interactive \
--pipeline ${PIPELINE_NAME} \
--config geode-images-pipeline/ci/pipelines/images/images.yml \
- --var concourse-team=${TEAM} \
--var geode-fork=${GEODE_FORK} \
--var geode-build-branch=${GEODE_BRANCH} \
--var docker-image-prefix=${DOCKER_IMAGE_PREFIX} \
diff --git a/ci/pipelines/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
similarity index 65%
rename from ci/pipelines/deploy_meta.sh
rename to ci/pipelines/meta/deploy_meta.sh
index 59e30af..1983dcd 100755
--- a/ci/pipelines/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -23,44 +23,53 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-GEODE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+for cmd in Jinja2 PyYAML; do
+ if ! [[ $(pip3 list |grep ${cmd}) ]]; then
+ echo "${cmd} must be installed for pipeline deployment to work."
+ echo " 'pip3 install ${cmd}'"
+ echo ""
+ exit 1
+ fi
+done
+
+export GEODE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
TARGET=geode
-GEODE_FORK=${1:-apache}
+export GEODE_FORK=${1:-apache}
-. ${SCRIPTDIR}/shared/utilities.sh
+. ${SCRIPTDIR}/../shared/utilities.sh
SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
-TEAM=$(fly targets | grep ^${TARGET} | awk '{print $3}')
-
PUBLIC=true
-echo "Deploying pipline for ${GEODE_FORK}/${GEODE_BRANCH} on team ${TEAM}"
-
-if [ "${TEAM}" = "staging" ]; then
- PUBLIC=false
-fi
+echo "Deploying pipline for ${GEODE_FORK}/${GEODE_BRANCH}"
if [[ "${GEODE_FORK}" == "apache" ]]; then
META_PIPELINE="meta-${SANITIZED_GEODE_BRANCH}"
PIPELINE_PREFIX=""
else
+ PUBLIC=false
META_PIPELINE="meta-${GEODE_FORK}-${SANITIZED_GEODE_BRANCH}"
PIPELINE_PREFIX="${GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
fi
-set -x
-fly -t ${TARGET} set-pipeline \
- -p ${META_PIPELINE} \
- -c meta.yml \
- --var geode-build-branch=${GEODE_BRANCH} \
- --var sanitized-geode-build-branch=${SANITIZED_GEODE_BRANCH} \
- --var sanitized-geode-fork=${SANITIZED_GEODE_FORK} \
- --var geode-fork=${GEODE_FORK} \
- --var pipeline-prefix=${PIPELINE_PREFIX} \
- --var concourse-team=${TEAM} \
- --yaml-var public-pipelines=${PUBLIC} 2>&1 |tee flyOutput.log
-set +x
+
+pushd ${SCRIPTDIR} 2>&1 > /dev/null
+# Template and output share a directory with this script, but variables are shared in the parent directory.
+ python3 ../render.py $(basename ${SCRIPTDIR}) || exit 1
+
+ fly -t ${TARGET} set-pipeline \
+ -p ${META_PIPELINE} \
+ --config ${SCRIPTDIR}/generated-pipeline.yml \
+ --var geode-build-branch=${GEODE_BRANCH} \
+ --var sanitized-geode-build-branch=${SANITIZED_GEODE_BRANCH} \
+ --var sanitized-geode-fork=${SANITIZED_GEODE_FORK} \
+ --var geode-fork=${GEODE_FORK} \
+ --var pipeline-prefix=${PIPELINE_PREFIX} \
+ --yaml-var public-pipelines=${PUBLIC} 2>&1 |tee flyOutput.log
+
+popd 2>&1 > /dev/null
+
if [[ "$(tail -n1 flyOutput.log)" == "bailing out" ]]; then
exit 1
@@ -69,7 +78,7 @@ fi
if [[ "${GEODE_FORK}" != "apache" ]]; then
echo "Disabling unnecessary jobs for forks."
set -x
- for job in set set-pr set-images set-metrics set-reaper set-examples; do
+ for job in set set-images set-reaper; do
fly -t ${TARGET} pause-job \
-j ${META_PIPELINE}/${job}-pipeline
done
diff --git a/ci/pipelines/meta.yml b/ci/pipelines/meta/jinja.template.yml
similarity index 95%
rename from ci/pipelines/meta.yml
rename to ci/pipelines/meta/jinja.template.yml
index 8b05bcc..58efbb9 100644
--- a/ci/pipelines/meta.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -42,67 +42,69 @@ resources:
- ci/pipelines/geode-build/*
- ci/pipelines/shared/*
- ci/pipelines/render.py
-- name: geode-examples-pipeline
+- name: geode-images-pipeline
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/pipelines/examples/*
- - ci/pipelines/shared/*
- - ci/pipelines/render.py
-- name: geode-pr-pipeline
+ - ci/pipelines/images/*
+- name: geode-reaper-pipeline
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/pipelines/pull-request/*
- - ci/pipelines/shared/*
- - ci/pipelines/render.py
-- name: geode-images-pipeline
+ - ci/pipelines/reaper.yml
+- name: meta-mini-dockerfile
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/pipelines/images/*
-- name: geode-metrics-pipeline
+ - ci/images/meta-mini/*
+- name: meta-mini-image
+ type: docker-image
+ source:
+ username: ((!docker-username))
+ password: ((!docker-password))
+ repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
+{% if repository.sanitized_fork == "apache" %}
+- name: geode-examples-pipeline
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/pipelines/metrics.yml
-- name: geode-reaper-pipeline
+ - ci/pipelines/examples/*
+ - ci/pipelines/shared/*
+ - ci/pipelines/render.py
+- name: geode-pr-pipeline
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/pipelines/reaper.yml
-- name: meta-mini-dockerfile
+ - ci/pipelines/pull-request/*
+ - ci/pipelines/shared/*
+ - ci/pipelines/render.py
+- name: geode-metrics-pipeline
type: git
source:
uri: https://github.com/((!geode-fork))/geode.git
branch: ((!geode-build-branch))
paths:
- - ci/images/meta-mini/*
-- name: meta-mini-image
- type: docker-image
- source:
- username: ((!docker-username))
- password: ((!docker-password))
- repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
+ - ci/pipelines/metrics.yml
+{% endif %}
jobs:
-- name: set-pipeline
+- name: set-images-pipeline
serial: true
public: ((!public-pipelines))
plan:
- - get: geode-pipeline
+ - get: geode-images-pipeline
trigger: true
- - task: deploy-build
+ - task: deploy-images
config:
platform: linux
image_resource:
@@ -113,7 +115,7 @@ jobs:
tag: latest
repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
inputs:
- - name: geode-pipeline
+ - name: geode-images-pipeline
outputs:
- name: results
params:
@@ -122,15 +124,15 @@ jobs:
GEODE_FORK: ((!geode-fork))
CONCOURSE_USERNAME: ((!concourse-username))
CONCOURSE_PASSWORD: ((!concourse-password))
- CONCOURSE_TEAM: ((!concourse-team))
+ PUBLIC_PIPELINES: ((!public-pipelines))
run:
- path: geode-pipeline/ci/pipelines/geode-build/deploy_pipeline.sh
+ path: geode-images-pipeline/ci/pipelines/images/deploy_images_pipeline.sh
-- name: set-examples-pipeline
+- name: set-pipeline
serial: true
public: ((!public-pipelines))
plan:
- - get: geode-examples-pipeline
+ - get: geode-pipeline
trigger: true
- task: deploy-build
config:
@@ -143,26 +145,26 @@ jobs:
tag: latest
repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
inputs:
- - name: geode-examples-pipeline
+ - name: geode-pipeline
outputs:
- - name: results
+ - name: results
params:
OUTPUT_DIRECTORY: results
GEODE_BRANCH: ((!geode-build-branch))
GEODE_FORK: ((!geode-fork))
CONCOURSE_USERNAME: ((!concourse-username))
CONCOURSE_PASSWORD: ((!concourse-password))
- CONCOURSE_TEAM: ((!concourse-team))
run:
- path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
+ path: geode-pipeline/ci/pipelines/geode-build/deploy_pipeline.sh
-- name: set-pr-pipeline
+{% if repository.sanitized_fork == "apache" %}
+- name: set-examples-pipeline
serial: true
public: ((!public-pipelines))
plan:
- - get: geode-pr-pipeline
+ - get: geode-examples-pipeline
trigger: true
- - task: deploy-pr
+ - task: deploy-build
config:
platform: linux
image_resource:
@@ -173,26 +175,25 @@ jobs:
tag: latest
repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
inputs:
- - name: geode-pr-pipeline
+ - name: geode-examples-pipeline
outputs:
- - name: results
+ - name: results
params:
OUTPUT_DIRECTORY: results
GEODE_BRANCH: ((!geode-build-branch))
GEODE_FORK: ((!geode-fork))
CONCOURSE_USERNAME: ((!concourse-username))
CONCOURSE_PASSWORD: ((!concourse-password))
- CONCOURSE_TEAM: ((!concourse-team))
run:
- path: geode-pr-pipeline/ci/pipelines/pull-request/deploy_pr_pipeline.sh
+ path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
-- name: set-images-pipeline
+- name: set-pr-pipeline
serial: true
public: ((!public-pipelines))
plan:
- - get: geode-images-pipeline
+ - get: geode-pr-pipeline
trigger: true
- - task: deploy-images
+ - task: deploy-pr
config:
platform: linux
image_resource:
@@ -203,19 +204,17 @@ jobs:
tag: latest
repository: gcr.io/apachegeode-ci/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
inputs:
- - name: geode-images-pipeline
+ - name: geode-pr-pipeline
outputs:
- - name: results
+ - name: results
params:
OUTPUT_DIRECTORY: results
GEODE_BRANCH: ((!geode-build-branch))
GEODE_FORK: ((!geode-fork))
CONCOURSE_USERNAME: ((!concourse-username))
CONCOURSE_PASSWORD: ((!concourse-password))
- CONCOURSE_TEAM: ((!concourse-team))
- PUBLIC_PIPELINES: ((!public-pipelines))
run:
- path: geode-images-pipeline/ci/pipelines/images/deploy_images_pipeline.sh
+ path: geode-pr-pipeline/ci/pipelines/pull-request/deploy_pr_pipeline.sh
- name: set-metrics-pipeline
serial: true
@@ -229,6 +228,7 @@ jobs:
- name: ((!pipeline-prefix))metrics
team: ((!concourse-team))
config_file: geode-metrics-pipeline/ci/pipelines/metrics.yml
+{% endif %}
- name: set-reaper-pipeline
serial: true
diff --git a/ci/pipelines/pull-request/deploy_pr_pipeline.sh b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
index eefa636..f4aa88d 100755
--- a/ci/pipelines/pull-request/deploy_pr_pipeline.sh
+++ b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
@@ -64,8 +64,6 @@ PATH=${PATH}:${BIN_DIR}
TARGET="geode"
-TEAM=${CONCOURSE_TEAM:-main}
-
if [[ "${SANITIZED_GEODE_FORK}" == "apache" ]]; then
PIPELINE_NAME="pr-${SANITIZED_GEODE_BRANCH}"
DOCKER_IMAGE_PREFIX=""
@@ -79,7 +77,6 @@ pushd ${SCRIPTDIR} 2>&1 > /dev/null
python3 ../render.py $(basename ${SCRIPTDIR}) || exit 1
fly login -t ${TARGET} \
- -n ${TEAM} \
-c https://concourse.apachegeode-ci.info \
-u ${CONCOURSE_USERNAME} \
-p ${CONCOURSE_PASSWORD}
@@ -88,8 +85,7 @@ pushd ${SCRIPTDIR} 2>&1 > /dev/null
--non-interactive \
--pipeline ${PIPELINE_NAME} \
--config ${SCRIPTDIR}/generated-pipeline.yml \
- --var docker-image-prefix=${DOCKER_IMAGE_PREFIX} \
- --var concourse-team=${TEAM}
+ --var docker-image-prefix=${DOCKER_IMAGE_PREFIX}
popd 2>&1 > /dev/null
diff --git a/ci/pipelines/shared/utilities.sh b/ci/pipelines/shared/utilities.sh
index 4365908..1fa9a25 100644
--- a/ci/pipelines/shared/utilities.sh
+++ b/ci/pipelines/shared/utilities.sh
@@ -18,9 +18,9 @@
getSanitizedBranch () {
- echo ${1} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-20
+ echo ${1} | tr "_/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-20
}
getSanitizedFork () {
- echo ${1} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-16
+ echo ${1} | tr "_/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-16
}