X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fgenerate_yamls.sh;h=9187e85dfd888047949b6bb4b43fc9d805a51867;hb=fbb206730195c6f03ded7658d08f1ef708ebf88b;hp=12017c8d7761abfae9f7b16340c0f33279e83698;hpb=4ef7080797d065dd191b4dfc0069a5dd598aaf8b;p=yaml_builds.git

diff --git a/tools/generate_yamls.sh b/tools/generate_yamls.sh
index 12017c8..9187e85 100755
--- a/tools/generate_yamls.sh
+++ b/tools/generate_yamls.sh
@@ -28,17 +28,24 @@ else
   echo "SITE=$SITE"
 fi
 
+cd $YAML_BUILDS
+
 # ECHO INPUT FILE TO LOGS FOR TROUBLESHOOTING
 echo "#######################################"
-echo "# USING INPUT FILE [$SITE.yaml]"
+echo "# USING INPUT FILE [${YAML_BUILDS}/${SITE}.yaml]"
 echo "#######################################"
-sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' $SITE.yaml
+sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' ${YAML_BUILDS}/${SITE}.yaml
 echo "#######################################"
 
-cd $YAML_BUILDS
 python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh
 source ./tools/env_$SITE.sh
 
+if [ ! -d "$AIRSHIP_TREASUREMAP" ] && [ -f "${AIRSHIP_TREASUREMAP}.tgz" ]; then
+  echo "Expanding [${AIRSHIP_TREASUREMAP}.tgz] to directory [$AIRSHIP_TREASUREMAP]."
+  mkdir -p "$AIRSHIP_TREASUREMAP"
+  tar xzvf "${AIRSHIP_TREASUREMAP}.tgz" --strip-components=1 -C "$AIRSHIP_TREASUREMAP"
+fi
+
 if [ ! -d "$AIRSHIP_TREASUREMAP" ]; then
   echo "ERROR: Missing AIRSHIP_TREASUREMAP directory [$AIRSHIP_TREASUREMAP]."
   exit -1
@@ -49,5 +56,27 @@ if [ ! -d "$AIRSHIP_TEMPLATES" ]; then
   exit -1
 fi
 
+echo "# Generating templates to $YAML_BUILDS/site/$SITE"
+rm -rf $YAML_BUILDS/site/$SITE
+mkdir -p $YAML_BUILDS/site/$SITE
 python ./scripts/jcopy.py $SITE.yaml $AIRSHIP_TEMPLATES $YAML_BUILDS/site/$SITE
-cp -r site/common/* site/$SITE/
+
+echo "# Merging config files to $AIRSHIP_TREASUREMAP/site/$SITE"
+rm -rf $AIRSHIP_TREASUREMAP/site/$SITE
+mkdir -p $AIRSHIP_TREASUREMAP/site/$SITE
+
+cp -r $AIRSHIP_TREASUREMAP/site/seaworthy/* $AIRSHIP_TREASUREMAP/site/$SITE
+cp -r $YAML_BUILDS/site/$SITE/* $AIRSHIP_TREASUREMAP/site/$SITE
+
+CONFIG_COUNT=`find $AIRSHIP_TREASUREMAP/site/$SITE -type f | wc -l`
+echo "#######################################"
+echo "# Created site $AIRSHIP_TREASUREMAP/site/$SITE with $CONFIG_COUNT config files"
+echo "#######################################"
+
+(
+echo "# Linting config files in $AIRSHIP_TREASUREMAP/site/$SITE"
+cd $AIRSHIP_TREASUREMAP
+$AIRSHIP_TREASUREMAP/tools/airship pegleg site -r /target lint $SITE -x P001 -x P005 || true
+)
+
+echo "#######################################"