summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-22 08:48:15 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-22 08:53:22 +0100
commit8737155c78e8376644fe1b11fc86a486e921bed1 (patch)
tree81a832d5581b0fe17b1f88d5f6b86dd8b64a6f80
parentc18ff1cf2fb2b3eba097334e166cf762fc660ddc (diff)
fuel: Enable force build
Change-Id: Ife5326ec3d64f2c2a3749461eb9687fa24fe15ac Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rwxr-xr-xjjb/fuel/fuel-build.sh7
-rw-r--r--jjb/fuel/fuel-project-jobs.yml6
2 files changed, 11 insertions, 2 deletions
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index 42e373cbc..eaf1f83e7 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -31,14 +31,17 @@ fi
# get current SHA1
CURRENT_SHA1=$(git rev-parse HEAD)
-if [[ "$CURRENT_SHA1" == "$LATEST_ISO_SHA1" ]]; then
+# 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 "An ISO has already been built for this commit"
echo " $LATEST_ISO_URL"
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
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index e42aa9012..d1855f86e 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -44,6 +44,12 @@
project: '{project}'
- 'ericsson-build-defaults'
- '{installer}-defaults'
+ - choice:
+ name: FORCE_BUILD
+ choices:
+ - 'false'
+ - 'true'
+ description: "Force build even if there is no changes in fuel repo. Default false"
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'