Apex: disable daily job for master

Even with a timed trigger that shouldn't execute more than once a year,
the apex-daily-master job is still triggering every day or so.  Using an
explicit disable to disable the job.

Change-Id: I3b014c0d0899dba617fcb7cfee17ca758b291f9f
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 058f18a..6bd2248 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -28,6 +28,7 @@
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
             scenario_stream: 'master'
+            disable_daily: true
         - euphrates: &euphrates
             branch: 'stable/euphrates'
             gs-pathname: '/euphrates'
@@ -36,6 +37,7 @@
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
             scenario_stream: 'euphrates'
+            disable_daily: false
         - danube: &danube
             branch: 'stable/danube'
             gs-pathname: '/danube'
@@ -45,6 +47,7 @@
             verify-scenario: 'os-odl_l3-nofeature-ha'
             scenario_stream: 'danube'
             disabled: true
+            disable_daily: true
 
     scenario:
         - 'os-nosdn-nofeature-noha':
@@ -899,7 +902,7 @@
 
     node: '{baremetal-slave}'
 
-    disabled: false
+    disabled: '{obj:disable_daily}'
 
     scm:
         - git-scm

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 09c2f8c..6bebf3b 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -28,6 +28,7 @@
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
             scenario_stream: 'master'
+            disable_daily: true
         - euphrates: &euphrates
             branch: 'stable/euphrates'
             gs-pathname: '/euphrates'
@@ -36,6 +37,7 @@
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
             scenario_stream: 'euphrates'
+            disable_daily: false
         - danube: &danube
             branch: 'stable/danube'
             gs-pathname: '/danube'
@@ -45,6 +47,7 @@
             verify-scenario: 'os-odl_l3-nofeature-ha'
             scenario_stream: 'danube'
             disabled: true
+            disable_daily: true
 
     scenario:
         {%- for stream in scenarios %}
@@ -769,7 +772,7 @@
 
     node: '{baremetal-slave}'
 
-    disabled: false
+    disabled: '{obj:disable_daily}'
 
     scm:
         - git-scm