X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdefaults.yaml;h=3844c7aeb67f5c3073a29f322250474977a28878;hb=004f298cb37ae7ab0c1f66746c9032c7960ffe4f;hp=8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01;hpb=3f74d54d316d9ee1648aa645be5dc71fe5b6cfa3;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 8f91a7f7b..3844c7aeb 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -20,7 +20,6 @@
     schedule-daily: 'H H * * *'
     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'
@@ -83,24 +82,8 @@
     sm-features: ''
 
     # CSIT images configuration
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - 20190429-114045.588
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
-    openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-    stack-template: csit-2-instance-type.yaml
-    docker_system_count: 1
-    docker_system_flavor: odl-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
-    odl_system_count: 1
-    odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
-    openstack_system_count: 1
-    openstack_system_flavor: odl-standard-4
-    openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    openstack_system2_count: 0
-    openstack_system2_flavor: odl-standard-1
-    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    tools_system_count: 1
-    tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Default Robot framework options
     robot-options: ''
@@ -111,9 +94,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/oxygen
+    verify-branch: stable/fluorine
     # Value for ODL_STREAM
-    verify-stream: oxygen
+    verify-stream: fluorine
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
@@ -195,21 +178,24 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
-    csit-high-frequency-list-neon: >
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-    csit-high-frequency-list-fluorine: >
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
-    csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-sodium: >
+        openflowplugin-csit-1node-sanity-only-sodium,
+        distribution-sanity-sodium
     csit-sanity-list-neon: >
         openflowplugin-csit-1node-sanity-only-neon,
         distribution-sanity-neon
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
-    csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen,
-        distribution-sanity-oxygen
+    csit-weekly-list-sodium: >
+        controller-csit-1node-notifications-longevity-only-sodium,
+        controller-csit-3node-drb-partnheal-longevity-only-sodium,
+        controller-csit-3node-drb-precedence-longevity-only-sodium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
+        distribution-deploy-sodium,
+        distribution-offline-sodium,
+        openflowplugin-csit-1node-longevity-only-sodium
     csit-weekly-list-neon: >
         controller-csit-1node-notifications-longevity-only-neon,
         controller-csit-3node-drb-partnheal-longevity-only-neon,
@@ -228,12 +214,3 @@
         distribution-deploy-fluorine,
         distribution-offline-fluorine,
         openflowplugin-csit-1node-longevity-only-fluorine
-    csit-weekly-list-oxygen: >
-        controller-csit-1node-notifications-longevity-only-oxygen,
-        controller-csit-3node-drb-partnheal-longevity-only-oxygen,
-        controller-csit-3node-drb-precedence-longevity-only-oxygen,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
-        bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
-        distribution-deploy-oxygen,
-        distribution-offline-oxygen,
-        openflowplugin-csit-1node-longevity-only-oxygen