X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2F1prom-gen.sh;h=e3c87926eb6daa55c57896ab4ef6f116f2d24474;hb=6373eaec0b198e0b72347112b91414917bbcc464;hp=68ab018a5a265c15a98d4c59f7fdfb3a33ff12a5;hpb=1951ee4f75821702845cbf84243f7aadd032fd53;p=yaml_builds.git

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 68ab018..e3c8792 100755
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -19,22 +19,17 @@
 # re-generate prom config
 
 set -xe
-TIMESTAMP=$(date +"%Y%m%d%H%M")
-echo "logging to /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log"
-mkdir -p /var/log/yaml_builds
-exec > /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log
+LOGDIR="/var/log/akraino"
+mkdir -p $LOGDIR
+LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
+echo "logging to $LOGFILE"
+exec 1> >(tee -a $LOGFILE)
 exec 2>&1
 
 source $(dirname $0)/setenv.sh
 
 PROMENADE_IMAGE=quay.io/airshipit/promenade:009f3de7ecf6afcdd2783ac7a12470394d7dfab3
 
-if [ -z "$AIRSHIP_TREASUREMAP" ]
-then
-  echo "Please use https://git.openstack.org/openstack/airship-treasuremap to clone airship_treasuremap. Also set AIRSHIP_TREASUREMAP to it."
-  exit -1
-fi
-
 if [ -z "$1" ]
 then
   echo "Please pass site name as command line argument"
@@ -45,6 +40,15 @@ else
 fi
 source $(dirname $0)/env_$SITE.sh
 
+if [ ! -d "$AIRSHIP_TREASUREMAP" ]; then
+  echo "ERROR: Missing AIRSHIP_TREASUREMAP directory [$AIRSHIP_TREASUREMAP]."
+  exit -1
+fi
+
+if [ ! -d "$AIRSHIP_TEMPLATES" ]; then
+  echo "ERROR: Missing AIRSHIP_TEMPLATES directory [$AIRSHIP_TEMPLATES]."
+  exit -1
+fi
 
 # Check that we are root
 if [[ $(whoami) != "root" ]]
@@ -104,7 +108,7 @@ create_scripts() {
 }
 
 prepare_tar(){
-   rm ./tars/promenade-bundle-$SITE.tar
+   rm -f ./tars/promenade-bundle-$SITE.tar
    tar cvf ./tars/promenade-bundle-$SITE.tar -C ./tars/$SITE .
 }
 
@@ -114,3 +118,8 @@ gen_certs
 gen_bundle
 create_scripts
 prepare_tar
+
+exec 2>&-
+exec 1>&-
+exit 0
+