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 2019/08/20 20:07:54 UTC

[geode] 06/09: Add flags to allow for local building. (#3830)

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

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

commit 3c5f1050ad0b41673eb29094595a9a907679cbcb
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Mon Jul 22 16:33:35 2019 -0700

    Add flags to allow for local building. (#3830)
    
    Authored-by: Sean Goller <sg...@pivotal.io>
    (cherry picked from commit 9c99e1bcb99ddf8c3ee8b16062e2e59924262a8a)
---
 ci/images/google-windows-geode-builder/build_image.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ci/images/google-windows-geode-builder/build_image.sh b/ci/images/google-windows-geode-builder/build_image.sh
index 7664642..8c6c3cd 100755
--- a/ci/images/google-windows-geode-builder/build_image.sh
+++ b/ci/images/google-windows-geode-builder/build_image.sh
@@ -17,6 +17,8 @@
 # limitations under the License.
 set -x
 
+PACKER=${PACKER:-packer135}
+INTERNAL=${INTERNAL:-true}
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -46,10 +48,15 @@ if [[ -n "${MY_NAME}" ]]; then
   GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
 fi
 
+if [[ -z "${GCP_PROJECT}" ]]; then
+  echo "GCP_PROJECT is unset. Cowardly refusing to continue."
+  exit 1
+fi
+
 HASHED_PIPELINE_PREFIX="i$(uuidgen -n @dns -s -N "${PIPELINE_PREFIX}")-"
 
 echo "Running packer"
-PACKER_LOG=1 packer build \
+PACKER_LOG=1 ${PACKER} build \
   --var "geode_docker_image=${GEODE_DOCKER_IMAGE}" \
   --var "pipeline_prefix=${PIPELINE_PREFIX}" \
   --var "hashed_pipeline_prefix=${HASHED_PIPELINE_PREFIX}" \
@@ -57,5 +64,5 @@ PACKER_LOG=1 packer build \
   --var "gcp_project=${GCP_PROJECT}" \
   --var "gcp_network=${GCP_NETWORK}" \
   --var "gcp_subnetwork=${GCP_SUBNETWORK}" \
-  --var "use_internal_ip=true" \
+  --var "use_internal_ip=${INTERNAL}" \
   windows-packer.json