Merge "Add a swap file to build machines"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 0c37c0bb49b0f58c9bb7b6367d5518252bce164b..f2a600d00168f8c6411f16709007a391cf6ba0d3 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -13,6 +13,7 @@
     build-timeout: 360
     build-node: centos7-builder-4c-4g
     schedule: ''
+    schedule-daily: 'H H * * *'
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
     schedule-high-frequency: 'H H/4 * * *'
@@ -68,6 +69,9 @@
     # Distribution bundle URL
     bundle-url: 'last'
     repo-url: ''
+    install-features: ''
+    sm-repos: ''
+    sm-features: ''
 
     # CSIT images configuration
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
@@ -97,10 +101,10 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/carbon
+    verify-branch: stable/oxygen
     # Value for ODL_STREAM
-    verify-stream: carbon
-    verify-karaf-version: karaf3
+    verify-stream: oxygen
+    verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     # Maven / Java
@@ -186,18 +190,12 @@
         netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
-    csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
-    csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
     csit-sanity-list-fluorine: >
-        openflowplugin-csit-1node-sanity-only-fluorine
+        openflowplugin-csit-1node-sanity-only-fluorine,
+        distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen
-    csit-sanity-list-nitrogen: >
-        openflowplugin-csit-1node-sanity-only-nitrogen
-    csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
+        openflowplugin-csit-1node-sanity-only-oxygen,
+        distribution-sanity-oxygen
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,
@@ -216,23 +214,3 @@
         distribution-deploy-oxygen,
         distribution-offline-oxygen,
         openflowplugin-csit-1node-longevity-only-oxygen
-    csit-weekly-list-nitrogen: >
-        controller-csit-1node-notifications-longevity-only-nitrogen,
-        controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
-        controller-csit-3node-drb-precedence-longevity-only-nitrogen,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
-        bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
-        distribution-deploy-nitrogen,
-        distribution-offline-nitrogen,
-        openflowplugin-csit-1node-longevity-only-nitrogen
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon,
-        controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
-        controller-csit-3node-cs-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-precedence-longevity-only-carbon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
-        distribution-deploy-carbon,
-        distribution-offline-carbon,
-        openflowplugin-csit-1node-longevity-only-carbon