Adjust foreman & fuel daily trigger times until SR1

Change-Id: Ie0c62e943d0ce2fea56511f25e07798bb13d5656
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 4d70b92..570c7a1 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -25,9 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            job-disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            job-disabled: false
 ########################
 # job templates
 ########################
@@ -195,7 +197,7 @@
 
     node: ericsson-build
 
-    disabled: 'foreman-disabled-{stream}'
+    disabled: '{job-disabled}'
 
     triggers:
         - 'foreman-{stream}'
@@ -729,13 +731,3 @@
     name: 'foreman-stable-arno'
     triggers:
         - timed: '0 12 * * *'
-########################
-# job disabled macros
-########################
-- disabled:
-    name: 'foreman-disabled-master'
-    disabled: 'true'
-
-- disabled:
-    name: 'foreman-disabled-stable-arno'
-    disabled: 'false'

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 0b653df..4dbce16 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -25,9 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            job-disabled: false
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            job-disabled: true
 
 ########################
 # job templates
@@ -206,7 +208,7 @@
 
     node: ericsson-build
 
-    disabled: 'fuel-disabled-{stream}'
+    disabled: '{job-disabled}'
 
     triggers:
         - 'fuel-{stream}'
@@ -799,14 +801,3 @@
     name: 'fuel-stable-arno'
     triggers:
         - timed: '0 7 * * *'
-
-########################
-# job disabled macros
-########################
-- disabled:
-    name: 'fuel-disabled-master'
-    disabled: 'false'
-
-- disabled:
-    name: 'fuel-disabled-stable-arno'
-    disabled: 'true'