summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-04-19 01:00:29 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-04 12:00:57 +0000
commit14ee821d3aa9e5716d5e234b10047df86595dbff (patch)
tree2d572c1ff2ad6e2ab5bae3635c8019646f8e37f9
parent510db6f4cb864e02053d86fdff10895fd2455010 (diff)
fuel: Disable build avoidance in CI
Change-Id: I086b47b956faaa6c57c532a99debd06c05b148a2 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rwxr-xr-xjjb/fuel/fuel-build.sh12
-rwxr-xr-xjjb/fuel/fuel-project-jobs.yml3
2 files changed, 8 insertions, 7 deletions
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index eaf1f83e7..95ebaa5a9 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -35,11 +35,13 @@ CURRENT_SHA1=$(git rev-parse HEAD)
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
+ 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 or forced build! Proceeding with the build."
/bin/rm -f $LATEST_ISO_PROPERTIES
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 0d768203f..f377c9bed 100755
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -60,8 +60,7 @@
branch: '{branch}'
triggers:
- - pollscm:
- cron: '0 H/4 * * *'
+ - timed: '0 H/4 * * *'
wrappers:
- timeout: