fix update script (#75)

* fix update script

* update CHANGELOG

Co-authored-by: Luigi Marini <[email protected]>

Author: robkooper

CHANGELOG.md

@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - proxy will no correctly handle paths that end with a / at the end.
 
+### CHanged
+- updated update-clowder script to work with migration to github
+
 ## 1.11.0 - 2020-08-31
 
 ### Added

scripts/ubuntu/update-clowder.sh

@@ -1,48 +1,77 @@
 #!/bin/bash
 
-# CATS-CORE is the main branch for this server
-CLOWDER_BRANCH=${CLOWDER_BRANCH:-"CATS-CORE"}
-CLOWDER_BUILD=${CLOWDER_BUILD:-"latestSuccessful"}
+# what version ("" == latest release)
+CLOWDER_BRANCH=${CLOWDER_BRANCH:-}
+#CLOWDER_BRANCH="develop"
+
+# compute some other variables
+if [ "${CLOWDER_BRANCH}" = "" ]; then
+  CLOWDER_VERSION=$(curl -s  https://opensource.ncsa.illinois.edu/projects/artifacts.php?key=CATS | grep '<option selected>' | sed 's#.*<option.*>\([0-9\.]*\)</option>#\1#')
+  CLOWDER_ZIPFILE=clowder-${CLOWDER_VERSION}.zip
+else
+  CLOWDER_VERSION="${CLOWDER_BRANCH}"
+  CLOWDER_ZIPFILE=clowder-${CLOWDER_VERSION}-${CLOWDER_BRANCH}.zip
+fi
+
+# Should text go to stdout, empty is not
+STDOUT="YES"
+
+# HipChat token for notifications
+HIPCHAT_TOKEN=""
+HIPCHAT_ROOM=""
+
+# Slack token for notifications
+SLACK_TOKEN=""
+SLACK_CHANNEL="#simpl-ops"
+
+# MSTeams Webhook
+MSTEAMS_URL=""
 
 # change to folder where script is installed
 cd /home/clowder
 
 # fetch software
-if [[ ${CLOWDER_BUILD} == latest* ]]; then
-  BB="${CLOWDER_BRANCH}/${CLOWDER_BUILD}"
+if [ -e ]; then
+  curl -f -s -z "${CLOWDER_ZIPFILE}" -o "${CLOWDER_ZIPFILE}" https://opensource.ncsa.illinois.edu/projects/artifacts/CATS/${CLOWDER_VERSION}/files/${CLOWDER_ZIPFILE} || exit 1
 else
-  BB="${CLOWDER_BRANCH}-${CLOWDER_BUILD}"
+  curl -f -s -o "${CLOWDER_ZIPFILE}" https://opensource.ncsa.illinois.edu/projects/artifacts/CATS/${CLOWDER_VERSION}/files/${CLOWDER_ZIPFILE} || exit 1
 fi
-URL="https://opensource.ncsa.illinois.edu/bamboo/browse/${BB}/artifact/shared/dist/"
-/usr/bin/wget -q -e robots=off -A "clowder-*.zip" -nd -r -N -l1 ${URL}
-LATEST=$( /bin/ls -1rt clowder-*.zip | tail -1 )
 
-if [ -s ${LATEST} ]; then
-  if [ "$1" == "--force" -o ${LATEST} -nt clowder ]; then
+if [ -s ${CLOWDER_ZIPFILE} ]; then
+  if [ "$1" == "--force" -o ${CLOWDER_ZIPFILE} -nt clowder ]; then
+    exec 3>&1
+    exec &> "/tmp/$$.txt"
+
     echo "UPDATING CLOWDER ON ${HOSTNAME}"
     echo " bamboo  branch  = ${CLOWDER_BRANCH}"
 
     # stop clowder
-    /sbin/stop clowder
+    /bin/systemctl stop clowder
 
     # save local modifications
     if [ -d clowder/custom ]; then
       mv clowder/custom clowder.custom
     fi
+    if [ -d clowder/logs ]; then
+      mv clowder/logs clowder.logs
+    fi
 
     # install new version
-    /bin/rm -rf clowder $( basename ${LATEST} .zip )
-    /usr/bin/unzip -q ${LATEST}
-    /bin/mv $( basename ${LATEST} .zip ) clowder
+    /bin/rm -rf clowder $( basename ${CLOWDER_ZIPFILE} .zip )
+    /usr/bin/unzip -q ${CLOWDER_ZIPFILE}
+    /bin/mv $( basename ${CLOWDER_ZIPFILE} .zip ) clowder
     /usr/bin/touch clowder
 
     # get some nice values from the build
-    echo " bamboo  build   = $( grep '\-Dbuild.bamboo' clowder/bin/clowder | sed 's/.*=\(.*\)"$/\1/' )"
+    echo " github  build   = $( grep '\-Dbuild.bamboo' clowder/bin/clowder | sed 's/.*=\(.*\)"$/\1/' )"
     echo " clowder version = $( grep '\-Dbuild.version' clowder/bin/clowder | sed 's/.*=\(.*\)"$/\1/' )"
     echo " clowder branch  = $( grep '\-Dbuild.branch' clowder/bin/clowder | sed 's/.*=\(.*\)"$/\1/' )"
     echo " clowder gitsha1 = $( grep '\-Dbuild.gitsha1' clowder/bin/clowder | sed 's/.*=\(.*\)"$/\1/' )"
 
     # restore local modifications
+    if [ -d clowder.logs ]; then
+      mv clowder.logs clowder/logs
+    fi
     if [ -d clowder.custom ]; then
       mv clowder.custom clowder/custom
     fi
@@ -56,6 +85,31 @@ if [ -s ${LATEST} ]; then
     fi
 
     # start clowder again
-    /sbin/start clowder
+    /bin/systemctl start clowder
+
+    # send message by hipchat
+    if [ "${HIPCHAT_TOKEN}" != "" -a "${HIPCHAT_ROOM}" != "" ]; then
+      url="https://hipchat.ncsa.illinois.edu/v1/rooms/message?format=json&auth_token=${HIPCHAT_TOKEN}"
+      txt=$(cat /tmp/$$.txt | sed 's/ /%20/g;s/!/%21/g;s/"/%22/g;s/#/%23/g;s/\$/%24/g;s/\&/%26/g;s/'\''/%27/g;s/(/%28/g;s/)/%29/g;s/:/%3A/g;s/$/<br\/>/g')
+      room=$(echo ${HIPCHAT_ROOM} | sed 's/ /%20/g;s/!/%21/g;s/"/%22/g;s/#/%23/g;s/\$/%24/g;s/\&/%26/g;s/'\''/%27/g;s/(/%28/g;s/)/%29/g;s/:/%3A/g')
+      body="room_id=${room}&from=clowder&message=${txt}"
+      result=$(curl -s -X POST -d "${body}" $url)
+    fi
+    if [ "${SLACK_TOKEN}" != "" -a "${SLACK_CHANNEL}" != "" ]; then
+      url="https://hooks.slack.com/services/${SLACK_TOKEN}"
+      txt=$(cat /tmp/$$.txt | sed 's/"/\\"/g;s/$/\\/g' | tr '\n' 'n' )
+      payload="payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"clowder\", \"text\": \"${txt}\", \"icon_url\": \"https://opensource.ncsa.illinois.edu/projects/artifacts/CATS/logo.png\"}"
+      result=$(curl -s -X POST --data-urlencode "${payload}" $url)
+    fi
+    if [ "${MSTEAMS_URL}" != "" ]; then
+      txt=$(cat /tmp/$$.txt | sed 's/"/\\"/g;s/$/\\/g' | tr '\n' 'n' )
+      payload="{\"title\": \"UPDATE CLOWDER\", \"text\": \"${txt}\" }"
+      result=$(curl -s -X POST -H "Content-Type: application/json" -d "${payload}" $MSTEAMS_URL)
+    fi
+    if [ "${STDOUT}" != "" ]; then
+      cat /tmp/$$.txt >&3
+    fi
+    rm /tmp/$$.txt
   fi
 fi
+