Merge "Generate and print link of the log files pushed to artifacts"

[releng.git] / jjb / armband / build.sh

diff --git a/jjb/armband/build.sh b/jjb/armband/build.sh
index 01d09aa..300306f 100755 (executable)
--- a/jjb/armband/build.sh
+++ b/jjb/armband/build.sh
@@ -16,6 +16,9 @@ echo "Host info: $(hostname) $(hostname -I)"
 
 cd $WORKSPACE
 
+# Armband requires initializing git submodules (e.g. for Fuel's clean_cache.sh)
+make submodules-init
+
 # remove the expired items from cache
 test -f $WORKSPACE/ci/clean_cache.sh && $WORKSPACE/ci/clean_cache.sh $CACHE_DIRECTORY
 
@@ -26,8 +29,10 @@ if [[ "$JOB_NAME" =~ "daily" ]]; then
     echo "Checking to see if we already built and stored Armband Fuel ISO for this commit"
 
     curl -s -o $LATEST_ISO_PROPERTIES http://$GS_URL/latest.properties 2>/dev/null
+fi
 
-    # get metadata of latest ISO
+# get metadata of latest ISO
+if grep -q OPNFV_GIT_SHA1 $LATEST_ISO_PROPERTIES 2>/dev/null; then
     LATEST_ISO_SHA1=$(grep OPNFV_GIT_SHA1 $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
     LATEST_ISO_URL=$(grep OPNFV_ARTIFACT_URL $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
 else