[geode] branch release/1.7.0 updated: GCP instances dont like underscores either? Using hyphen (#2440)

[nn...@apache.org]

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

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


The following commit(s) were added to refs/heads/release/1.7.0 by this push:
     new 00f68ba  GCP instances dont like underscores either? Using hyphen (#2440)
00f68ba is described below

commit 00f68baa2165dc7e2120d68f087ae6944af741d7
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Fri Sep 7 11:02:02 2018 -0700

    GCP instances dont like underscores either? Using hyphen (#2440)
---
 ci/pipelines/shared/utilities.sh | 4 ++--
 ci/scripts/start_instance.sh     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pipelines/shared/utilities.sh b/ci/pipelines/shared/utilities.sh
index e075515..f809703 100644
--- a/ci/pipelines/shared/utilities.sh
+++ b/ci/pipelines/shared/utilities.sh
@@ -18,9 +18,9 @@
 
 
 getSanitizedBranch () {
-  echo ${1} | tr "/" "-" | tr "." "_" | tr '[:upper:]' '[:lower:]' | cut -c 1-20
+  echo ${1} | tr "/" "-" | tr "." "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-20
 }
 
 getSanitizedFork () {
-  echo ${1} | tr "/" "-" | tr "." "_" | tr '[:upper:]' '[:lower:]' | cut -c 1-16
+  echo ${1} | tr "/" "-" | tr "." "-" | tr '[:upper:]' '[:lower:]' | cut -c 1-16
 }
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index 0cc0f7a..054c58c 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -50,16 +50,16 @@ fi
 SANITIZED_GEODE_BRANCH=$(getSanitizedBranch ${GEODE_BRANCH})
 SANITIZED_GEODE_FORK=$(getSanitizedFork ${GEODE_FORK})
 
-SANITIZED_BUILD_PIPELINE_NAME=$(echo ${BUILD_PIPELINE_NAME} | tr "/" "-" | tr "." "_" | tr '[:upper:]' '[:lower:]')
-SANITIZED_BUILD_JOB_NAME=$(echo ${BUILD_JOB_NAME} | tr "/" "-" | tr "." "_" | tr '[:upper:]' '[:lower:]')
-SANITIZED_BUILD_NAME=$(echo ${BUILD_NAME} | tr "/" "-" | tr "." "_" | tr '[:upper:]' '[:lower:]')
+SANITIZED_BUILD_PIPELINE_NAME=$(echo ${BUILD_PIPELINE_NAME} | tr "/" "-" | tr "." "-" | tr '[:upper:]' '[:lower:]')
+SANITIZED_BUILD_JOB_NAME=$(echo ${BUILD_JOB_NAME} | tr "/" "-" | tr "." "-" | tr '[:upper:]' '[:lower:]')
+SANITIZED_BUILD_NAME=$(echo ${BUILD_NAME} | tr "/" "-" | tr "." "-" | tr '[:upper:]' '[:lower:]')
 IMAGE_FAMILY_PREFIX=""
 
 if [[ "${SANITIZED_GEODE_FORK}" != "apache" ]]; then
   IMAGE_FAMILY_PREFIX="${SANITIZED_GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
 fi
 
-INSTANCE_NAME="$(echo "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}" | tr "." "_" | tr '[:upper:]' '[:lower:]')"
+INSTANCE_NAME="$(echo "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}" | tr "." "-" | tr '[:upper:]' '[:lower:]')"
 PROJECT=apachegeode-ci
 ZONE=us-central1-f
 echo "${INSTANCE_NAME}" > "instance-data/instance-name"