install-osrf.sh: avoid log spew on cstore max_children master
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Thu, 14 May 2020 18:48:51 +0000 (11:48 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 27 May 2020 18:10:52 +0000 (11:10 -0700)
deployment/install-eg.sh
deployment/install-osrf.sh

index 5be245b..088f78d 100755 (executable)
@@ -9,11 +9,11 @@ INSTALLDIR="/srv/openils"
 REPO="git+ssh://git@git.sitka.bclibraries.ca/sitka/evergreen"
 #REPO="git://git.evergreen-ils.org/working/Evergreen.git"
 #REPO="git://git.evergreen-ils.org/Evergreen.git"
-BRANCH="user/jeffdavis/eg334-tpac"
-STAMP_ID="rel_3_3_4"
-VERSION="3.3.4.sitka.1"
+BRANCH="user/jeffdavis/upgrade-35rc-tpac"
+STAMP_ID="rel_3_5"
+VERSION="3.5.sitka.1"
 SITKACONF="/home/${DEFAULT_USER}/sysadmin"
-SITKACONF_BRANCH="master"
+SITKACONF_BRANCH="eg35"
 SITKATOOLS="/root/sitka-tools"
 
 THISHOST=`hostname -s`
@@ -22,7 +22,7 @@ suwrap() {
   su -s /bin/bash -c "source ~/.bashrc ; $1" $2
 }
 
-while getopts ":pecnWbtu" opt ; do
+while getopts ":pecnWbrtuD" opt ; do
   case $opt in
     p ) PROD="prod";;
     e ) EDI="edi";;
@@ -30,8 +30,10 @@ while getopts ":pecnWbtu" opt ; do
     n ) NFS="nfs";;
     W ) SKIPWEBCLIENT="skipwebclient";;
     b ) USEBUNDLE="usebundle";;
+    r ) RUNTESTS="runtests";;
     t ) TARBALL="tarball";;
     u ) UPDATEONLY="updateonly";;
+    D ) CLEANINSTALL="cleaninstall";;
   esac
 done
 shift $(($OPTIND - 1))
@@ -67,6 +69,11 @@ if [[ -n "$TARBALL" ]] ; then
   fi
   suwrap "cd /home/${INSTALL_USER} && tar xzf ${EGRELEASETGZ}" ${INSTALL_USER}
 else
+  if [[ -n "$CLEANINSTALL" ]] ; then
+    rm -rf "${BUILDDIR}"
+    cd /usr/local/bin/ && rm ng node npm npx
+    cd /usr/local/lib/ && rm -rf node_modules/
+  fi
   # checkout EG source
   if [ ! -d "${BUILDDIR}" ]
   then
@@ -97,11 +104,14 @@ if [[ ! -n "$TARBALL" && ! -n "$SKIPWEBCLIENT" ]] ; then
     cd ${BUILDDIR}/Open-ILS/web/js/ui/default/staff/
     sed -i "s|'/openils/lib/javascript|'${INSTALLDIR}/lib/javascript|g" ${BUILDDIR}/Open-ILS/web/js/ui/default/staff/test/karma.conf.js
     suwrap "npm install" ${INSTALL_USER}
-    suwrap "npm run build-prod && npm run test" ${INSTALL_USER} || { echo 'Could not install files for AngularJS staff client' ; exit 1; }
+    suwrap "npm run build-prod" ${INSTALL_USER} || { echo 'Could not install files for AngularJS staff client' ; exit 1; }
+    if [ -n "$RUNTESTS" ] ; then suwrap "npm run test" ${INSTALL_USER} || { echo 'Tests failed for AngularJS staff client' ; exit 1; } ; fi
     cd ${BUILDDIR}/Open-ILS/src/eg2/
     sed -i "s|'/openils/lib/javascript|'${INSTALLDIR}/lib/javascript|g" ${BUILDDIR}/Open-ILS/src/eg2/karma.conf.js
+    sed -i "s|locales: ['en-US']|locales: ['en-US','en-CA','fr-CA']|" ${BUILDDIR}/Open-ILS/src/eg2/src/environments/environment.prod.ts
     suwrap "npm install" ${INSTALL_USER}
-    suwrap "ng build --prod && npm run test" ${INSTALL_USER} || { echo 'Could not install files for Angular staff client' ; exit 1; }
+    suwrap "ng build --prod" ${INSTALL_USER} || { echo 'Could not install files for Angular staff client' ; exit 1; }
+    if [ -n "$RUNTESTS" ] ; then suwrap "npm run test" ${INSTALL_USER} || { echo 'Tests failed for Angular staff client' ; exit 1; } ; fi
   fi
 fi
 
index f1f17d4..2449309 100755 (executable)
@@ -3,10 +3,11 @@ DEFAULT_USER="opensrf"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/opensrf"
 INSTALLDIR="/srv/openils"
-BRANCH="rel_3_2"
+#BRANCH="rel_3_2"
+BRANCH="user/berick/lpxxx-c-backlog-speedbump"
 HOSTNAME="nonprod"
 SITKACONF="${HOMEDIR}/sysadmin"
-SITKACONF_BRANCH="master"
+SITKACONF_BRANCH="eg35"
 
 WEBSOCKETD_VERSION="0.3.0"
 WEBSOCKETD_ZIP="websocketd-${WEBSOCKETD_VERSION}-linux_amd64.zip"