Merge "Add plots to netconf-scale-max-devices job"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d08be1a915f2a50c94258a060f286f37af500ad4..3222dc295a4877fb24bceefd748a12f36545c7a8 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -83,6 +83,7 @@
     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
 
@@ -95,9 +96,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
 
@@ -185,8 +186,6 @@
         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
@@ -196,9 +195,6 @@
     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,
@@ -226,12 +222,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