This is an automated email from the ASF dual-hosted git repository. jbarrett 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 7b6f5fa GEODE-5633 pr pipeline name has fork and branch (#2391) 7b6f5fa is described below commit 7b6f5fa0ca05fa21a713070fc8ad87badd3e4684 Author: FSOUTHERLAND <39743785+fsoutherl...@users.noreply.github.com> AuthorDate: Tue Aug 28 13:56:03 2018 -0700 GEODE-5633 pr pipeline name has fork and branch (#2391) Authored-by: Finn Southerland <fsoutherl...@pivotal.io> --- ci/pipelines/pull-request/deploy_pr_pipeline.sh | 8 ++++---- ci/pipelines/shared/utilities.sh | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/pipelines/pull-request/deploy_pr_pipeline.sh b/ci/pipelines/pull-request/deploy_pr_pipeline.sh index 78c5e78..eefa636 100755 --- a/ci/pipelines/pull-request/deploy_pr_pipeline.sh +++ b/ci/pipelines/pull-request/deploy_pr_pipeline.sh @@ -67,11 +67,11 @@ TARGET="geode" TEAM=${CONCOURSE_TEAM:-main} if [[ "${SANITIZED_GEODE_FORK}" == "apache" ]]; then - PIPELINE_PREFIX="" + PIPELINE_NAME="pr-${SANITIZED_GEODE_BRANCH}" DOCKER_IMAGE_PREFIX="" else - PIPELINE_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-" - DOCKER_IMAGE_PREFIX=${PIPELINE_PREFIX} + PIPELINE_NAME="pr-${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}" + DOCKER_IMAGE_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-" fi pushd ${SCRIPTDIR} 2>&1 > /dev/null @@ -86,7 +86,7 @@ pushd ${SCRIPTDIR} 2>&1 > /dev/null fly -t ${TARGET} set-pipeline \ --non-interactive \ - --pipeline pr-${SANITIZED_GEODE_BRANCH} \ + --pipeline ${PIPELINE_NAME} \ --config ${SCRIPTDIR}/generated-pipeline.yml \ --var docker-image-prefix=${DOCKER_IMAGE_PREFIX} \ --var concourse-team=${TEAM} diff --git a/ci/pipelines/shared/utilities.sh b/ci/pipelines/shared/utilities.sh index eef105f..4365908 100644 --- a/ci/pipelines/shared/utilities.sh +++ b/ci/pipelines/shared/utilities.sh @@ -16,8 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env bash - getSanitizedBranch () { echo ${1} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-20 @@ -26,4 +24,3 @@ getSanitizedBranch () { getSanitizedFork () { echo ${1} | tr "/" "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-16 } -