summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/fuel')
-rwxr-xr-xjjb/fuel/fuel-build.sh12
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml16
-rwxr-xr-xjjb/fuel/fuel-project-jobs.yml3
3 files changed, 16 insertions, 15 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-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index e1816b528..77b711e74 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -278,35 +278,35 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 12 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 15 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 0 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 3 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 6 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
triggers:
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: