diff options
| -rwxr-xr-x | jjb/fuel/fuel-build.sh | 7 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 6 |
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}' |