Merge pull request #739 from basho/aws-fix

fadushin · web-flow · commit e15fe64f9ef9 · 2017-08-25T10:31:53.000-04:00
Added workaround for missing Solr and yokozuna artifacts on AWS
diff --git a/tools/grab-solr.sh b/tools/grab-solr.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 #
 # Script to grab Solr and embed in priv dir. This script assumes it is
 # being called from root dir or tools dir.
@@ -25,6 +25,7 @@ TMP_FILE=$TMP_DIR/$FILENAME
 SRC_DIR=$BUILD_DIR/$VSN
 EXAMPLE_DIR=$SRC_DIR/example
 COL1_DIR=$EXAMPLE_DIR/solr/collection1
+: ${ARTIFACT_URL_PREFIX:="http://s3.amazonaws.com/files.basho.com"}
 
 check_for_solr()
 {
@@ -52,7 +53,7 @@ get_solr()
                 ln -s $TMP_FILE $FILENAME
             else
                 echo "Pulling Solr from S3"
-                download "http://s3.amazonaws.com/files.basho.com/solr/$FILENAME"
+                download "${ARTIFACT_URL_PREFIX}/solr/$FILENAME"
                 if [ -d $TMP_DIR ]; then
                     cp $FILENAME $TMP_DIR
                 else
@@ -120,7 +121,7 @@ then
     fi
 
     echo "Downloading $YZ_JAR_NAME"
-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$YZ_JAR_NAME"
+    download "${ARTIFACT_URL_PREFIX}/yokozuna/$YZ_JAR_NAME"
     mv $YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
 fi
 
@@ -131,6 +132,6 @@ MON_JAR_NAME=yz_monitor-$MON_JAR_VSN.jar
 if [ ! -e $EXT_LIB/$MON_JAR_NAME ]
 then
     echo "Downloading $MON_JAR_NAME"
-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$MON_JAR_NAME"
+    download "${ARTIFACT_URL_PREFIX}/yokozuna/$MON_JAR_NAME"
     mv $MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
 fi
