Remove nitrogen branches in projects

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 0e3ef318bf28728a8ab473bd3a8a3829eb5b5334..d5eb422019b0f4bc58ca1115f3ce9e4f8fbf5ebe 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,25 +69,28 @@
     # 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
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v2-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
+    docker_system_flavor: odl-standard-1
+    docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
-    odl_system_flavor: v2-highcpu-4
+    odl_system_flavor: odl-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v2-standard-4
+    openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v2-standard-1
+    openstack_system2_flavor: odl-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v2-highcpu-2
+    tools_system_flavor: odl-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
@@ -97,9 +101,9 @@
 
     # 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-stream: oxygen
     verify-karaf-version: karaf3
     verify-jdkversion: openjdk8
 
@@ -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