[geode] branch develop updated: [GEODE-5539] remove pr tags from jobs, provide sane defaults.

[jb...@apache.org]

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 b6f55c7  [GEODE-5539] remove pr tags from jobs, provide sane defaults.
b6f55c7 is described below

commit b6f55c7e9cdd45243729d0e02824c39ee7e400e0
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Tue Aug 7 15:12:09 2018 -0700

    [GEODE-5539] remove pr tags from jobs, provide sane defaults.
    
    Signed-off-by: Dick Cavender <dc...@pivotal.io>
---
 ci/pipelines/pull-request/base.yml              | 1 -
 ci/pipelines/pull-request/deploy_pr_pipeline.sh | 5 ++++-
 ci/pipelines/pull-request/pr-template.yml       | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/pipelines/pull-request/base.yml b/ci/pipelines/pull-request/base.yml
index d7c5a60..aa1c726 100644
--- a/ci/pipelines/pull-request/base.yml
+++ b/ci/pipelines/pull-request/base.yml
@@ -93,7 +93,6 @@ jobs:
         status: pending
 
     - task: build
-      tags: [pr]
       image: docker-geode-build-image
       config:
         platform: linux
diff --git a/ci/pipelines/pull-request/deploy_pr_pipeline.sh b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
index 6a122e9..da281ad 100755
--- a/ci/pipelines/pull-request/deploy_pr_pipeline.sh
+++ b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
@@ -24,6 +24,7 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 GEODEBUILDDIR="${SCRIPTDIR}/../geode-build"
+GEODE_FORK=${GEODE_FORK:-apache}
 
 if ! [ -x "$(command -v spruce)" ]; then
     echo "Spruce must be installed for pipeline deployment to work."
@@ -48,6 +49,8 @@ fi
 
 SANITIZED_GEODE_BRANCH=$(echo ${GEODE_BRANCH} | tr "/" "-" | tr '[:upper:]' '[:lower:]')
 
+OUTPUT_DIRECTORY=${OUTPUT_DIRECTORY:-$SCRIPTDIR}
+
 BIN_DIR=${OUTPUT_DIRECTORY}/bin
 TMP_DIR=${OUTPUT_DIRECTORY}/tmp
 mkdir -p ${BIN_DIR} ${TMP_DIR}
@@ -80,7 +83,7 @@ ${SPRUCE} merge --prune metadata \
 
 TARGET="geode"
 
-TEAM=${CONCOURSE_TEAM}
+TEAM=${CONCOURSE_TEAM:-main}
 
 #if [[ "${GEODE_BRANCH}" == "develop" ]] || [[ ${GEODE_BRANCH} =~ ^release/* ]]; then
 #  TEAM="main"
diff --git a/ci/pipelines/pull-request/pr-template.yml b/ci/pipelines/pull-request/pr-template.yml
index 6f37b82..18d1e41 100644
--- a/ci/pipelines/pull-request/pr-template.yml
+++ b/ci/pipelines/pull-request/pr-template.yml
@@ -85,7 +85,6 @@ jobs:
           path: geode/ci/scripts/rsync_code_up.sh
     - task: execute_tests
       timeout: (( grab metadata.job.timeout ))
-      tags: [pr]
       config:
         inputs:
           - name: geode