Add defaults for timed values

Change-Id: I4c817d59d465ed269aa57f14b849b8333fd82e31
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
index 750498eded1374522f8f675eb1be743209394aec..76d8173b0cc0337b598e85989e63cac217d9321a 100644 (file)
--- a/jjb/coe/coe-csit-openstack.yaml
+++ b/jjb/coe/coe-csit-openstack.yaml
@@ -20,9 +20,7 @@
 
     testplan: '{project}-{topology}-openstack.txt'
 
-    functionality:
-      - kubernetes:
-          schedule: ''
+    functionality: 'kubernetes'
 
     stream:
       - oxygen:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 3bc42fc1c85e07107fae55ac69714a8b735cc9b8..004193db7d358c411d890511ee4606edf4f308b3 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -43,8 +43,6 @@
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
 
-    schedule: 'H H * * *'
-
     public-bridge: 'br-int'
 
     enable-openstack-plugins: 'networking-odl'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index c81cb25cfb3ac3a2803896e51d712eed60aeb6ba..98e9102433d5fbdf6d7709c65fd495caf88b28f1 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -24,9 +24,7 @@
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
-          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          schedule-high-frequency: 'H H/4 * * *'
 
       - nitrogen:
           branch: 'stable/nitrogen'
@@ -35,9 +33,7 @@
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          schedule-high-frequency: 'H H/4 * * *'
 
       - carbon:
           branch: 'stable/carbon'
@@ -48,9 +44,7 @@
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
-          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
-          schedule-high-frequency: 'H H/4 * * *'
 
       - boron:
           branch: 'stable/boron'
@@ -61,7 +55,6 @@
           csit-list: !include: csit-jobs-boron.lst
           csit-sanity-list: '{csit-sanity-list-boron}'
           csit-weekly-list: '{csit-weekly-list-boron}'
-          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: ''
           schedule-high-frequency: ''
 

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 1e88f79d64e4108edcc82a0fe1b315d8cb98c38f..323fa58b17c7f1d4cd40d568189c88d0cfd2f7e0 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -24,10 +24,8 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
 
     stream:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 08ec33df1a6b5f7dc1ab5d1938613f4ede2ed59f..407dfb61e00df73a343eb8eb186c5cff5f95af37 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -25,21 +25,16 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
           sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
@@ -94,21 +89,16 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
           sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
@@ -164,17 +154,13 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
 
@@ -224,33 +210,24 @@
 
     functionality:
       - upstream-transparent:
-          schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - upstream-learn:
-          schedule: ''
           sg-mode: 'learn'
       - gate-learn:
-          schedule: ''
           sg-mode: 'learn'
       - gate-transparent:
-          schedule: ''
           sg-mode: 'transparent'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-minimal-transparent:
-          schedule: ''
           sg-mode: 'transparent'
           testplan: '{project}-{topology}-minimal-openstack.txt'
       - gate-tempest-transparent:
-          schedule: ''
           sg-mode: 'transparent'
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
@@ -284,7 +261,6 @@
 
     functionality:
       - sfc:
-          schedule: ''
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index 4c29c7dcb93b2cc612d42fb646d2cf72405b3588..34c1fda885e71fe8f51f996ec2f1d7208b039fcf 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -25,10 +25,8 @@
 
     # The project name
     functionality:
-      - upstream:
-          schedule: ''
-      - gate:
-          schedule: ''
+      - upstream
+      - gate
 
     stream:
       - boron:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 173c6bad676b3168859c7a298bf4981567943692..a1ee79ddfd3c9ba7ac43feb85171823d93fffc0b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -45,5 +45,4 @@
     # mininet image
     tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
-    # Trigger jobs (on saturday)
-    schedule: 'H H * * 6'
+    schedule: '{schedule-saturday}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 0fd1c418af72c5a85edf9ccff9f10d8873a5000d..fd529707c7b52e64430437fa8c848f987994d528 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -36,7 +36,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
           server-name: '{server-name}'
           name: 'ovsdb'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 74f1aa36025d8e0838e473d2a14afc8aa7b9f3c1..8ca67b2f97b8b2557b0736cd513e8fe33c11ad80 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -10,6 +10,10 @@
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
+    schedule: ''
+    schedule-saturday: 'H H * * 6'
+    schedule-weekly: 'H 23 * * 6'
+    schedule-high-frequency: 'H H/4 * * *'
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 0eff4f9c51762ae81543124daa745dc040c30d60..9b0da3c32eed6ff647fb3a01026de4675e83902a 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -35,7 +35,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
 
     builders:
       - provide-maven-settings:
@@ -278,7 +278,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
           server-name: '{server-name}'
           name: '{project}'

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index a1c158bc38480ef8cd2d4d2bad21f9efd2a5963e..2a68a273dded472876bd8e28191e20b95c6b3773 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -41,8 +41,6 @@
           odl-ml2-branch: 'stable/newton'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
-    schedule: ''
-
     odl-enable-l3: 'no'
 
     public-bridge: 'br-ex'