Detected solace service broker version saved in releases/release-vars…

….yml, used by at deployment time if present
SolaceDev · Oct 19, 2018 · a414f08 · a414f08
1 parent 6dcd62c
commit a414f08
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bin/deploy-common.sh b/bin/deploy-common.sh
@@ -90,7 +90,7 @@ function checkDeploymentRequirements() {
 
 function checkSolaceReleases() {
 
- SOLACE_PUBSUB_RELEASE_FOUND_COUNT=`bosh releases | grep -v solace-pubsub-broker | grep solace-pubsub | wc -l`
+ SOLACE_PUBSUB_RELEASE_FOUND_COUNT=$( bosh releases | grep -v solace-pubsub-broker | grep solace-pubsub | wc -l)
 
  if [ "$SOLACE_PUBSUB_RELEASE_FOUND_COUNT" -eq "0" ]; then
    echo "solace-pubsub release seem to be missing from bosh, please upload-release to bosh"
@@ -99,7 +99,7 @@ function checkSolaceReleases() {
    exit 1
  fi
 
- SOLACE_MESSAGING_RELEASE_FOUND_COUNT=`bosh releases | grep solace-pubsub-broker | wc -l`
+ SOLACE_MESSAGING_RELEASE_FOUND_COUNT=$( bosh releases | grep solace-pubsub-broker | wc -l)
 
  if [ "$SOLACE_MESSAGING_RELEASE_FOUND_COUNT" -eq "0" ]; then
    echo "solace-pubsub-broker release seem to be missing from bosh, please upload-release to bosh"
@@ -344,5 +344,10 @@ if [ -f "$RELEASE_VARS_FILE" ]; then
    fi
 fi
 
+## Handle addiotnal bosh release detected variables
+if [ -f "$WORKSPACE/releases/release-vars.yml" ]; then
+   RELEASE_VARS="$RELEASE_VARS -l $WORKSPACE/releases/release-vars.yml"
+fi
+
 BOSH_PARAMS=" $OPS_BASE $MYSQL_OPS $FEATURES_OPS -o $CF_SOLACE_MESSAGING_DEPLOYMENT_HOME/operations/is_${VMR_EDITION}.yml $VARS_STORE $CMD_VARS -l $VARS_FILE $FEATURES_VARS $RELEASE_VARS $MISC_VARS $EXTRA_BOSH_PARAMS"
 
diff --git a/bin/extract_tile.sh b/bin/extract_tile.sh
@@ -128,5 +128,6 @@ unzip -o -d $WORKSPACE $TILE_FILE releases/*.tgz
  cd ./solace_pubsub_broker/ 
  SOLACE_SERVICE_BROKER_VERSION=$(ls *.jar)
  echo " Found Solace Service Broker [ $SOLACE_SERVICE_BROKER_VERSION ]"
+ echo "solace_service_broker_jar: $SOLACE_SERVICE_BROKER_VERSION" > $WORKSPACE/releases/release-vars.yml
 )
 
diff --git a/bin/solace_upload_releases.sh b/bin/solace_upload_releases.sh
@@ -11,9 +11,10 @@ if [ -f $WORKSPACE/bosh_env.sh ]; then
 fi
 
 source $SCRIPTPATH/bosh-common.sh
+
 loadStemcells
 
-for RELEASE_FILE in `ls $WORKSPACE/releases/*.tgz`; do
+for RELEASE_FILE in $(ls $WORKSPACE/releases/*.tgz); do
   RELEASE=$(basename $RELEASE_FILE)
   echo "Uploading release $RELEASE"
   bosh upload-release $RELEASE_FILE