X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-build.sh;h=e1a4c0267114ca1e08ed9b075cba9e8ef1766989;hb=7ec35d47f4130e06f9ce3b577eb5b1961a166b2c;hp=1602078d1411c1f1fd29a33cbcdf435aa2713dcc;hpb=8722b62ef61bd9d85eb1717d32ffeb13da0a6056;p=releng.git

diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index 1602078d1..e1a4c0267 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -1,19 +1,34 @@
 #!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 set -o errexit
 set -o nounset
 set -o pipefail
 
+export TERM="vt220"
+
 cd $WORKSPACE
 
+# remove the expired items from cache
+test -f $WORKSPACE/ci/clean_cache.sh && $WORKSPACE/ci/clean_cache.sh $CACHE_DIRECTORY
+
+LATEST_ISO_PROPERTIES=$WORKSPACE/latest.iso.properties
 if [[ "$JOB_NAME" =~ "daily" ]]; then
     # check to see if we already have an artifact on artifacts.opnfv.org
     # for this commit during daily builds
     echo "Checking to see if we already built and stored Fuel ISO for this commit"
 
-    LATEST_ISO_PROPERTIES=$WORKSPACE/latest.iso.properties
     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
@@ -23,14 +38,19 @@ fi
 # get current SHA1
 CURRENT_SHA1=$(git rev-parse HEAD)
 
-if [[ "$CURRENT_SHA1" == "$LATEST_ISO_SHA1" ]]; then
-    echo "An ISO has already been built for this commit"
-    echo "    $LATEST_ISO_URL"
-    echo "Nothing new to build. Exiting."
-    touch $WORKSPACE/.noupload
-    exit 0
+# set FORCE_BUILD to false for non-daily builds
+FORCE_BUILD=${FORCE_BUILD:-false}
+
+if [[ "$CURRENT_SHA1" == "$LATEST_ISO_SHA1" && "$FORCE_BUILD" == "false" ]]; then
+    echo "***************************************************"
+    echo "   An ISO has already been built for this commit"
+    echo "   $LATEST_ISO_URL"
+    echo "***************************************************"
+#    echo "Nothing new to build. Exiting."
+#    touch $WORKSPACE/.noupload
+#    exit 0
 else
-    echo "This commit has not been built yet. Proceeding with the build."
+    echo "This commit has not been built yet or forced build! Proceeding with the build."
     /bin/rm -f $LATEST_ISO_PROPERTIES
     echo
 fi
@@ -56,7 +76,7 @@ if [[ "$JOB_NAME" =~ "verify" && "$GERRIT_CHANGE_COMMIT_MESSAGE" =~ "$NOCACHE_PA
     echo "The cache will not be used for this build!"
     NOCACHE_ARG="-f P"
 fi
-NOCACHE_ARG=${{NOCACHE_ARG:-}}
+NOCACHE_ARG=${NOCACHE_ARG:-}
 
 # start the build
 cd $WORKSPACE/ci
@@ -71,7 +91,7 @@ ls -al $BUILD_DIRECTORY
     echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
     echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
     echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
-    echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
+    echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
     echo "OPNFV_BUILD_URL=$BUILD_URL"
 ) > $WORKSPACE/opnfv.properties