X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=a328195fc3d9fd5c545e79348fa94b6d844b8ee3;hb=428a47a10b3a6c59670063400095511d83d8cf51;hp=d01dad25773111d9ad61403a44ff4e5b8d810a87;hpb=1bbbd5b98d21a76bacb359663bafca75f18f50b4;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d01dad257..a328195fc 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -61,6 +61,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    group-add-mod-enabled: 'false'
     enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
     os-cmb-cnt: 1
@@ -82,9 +83,13 @@
     sm-repos: ''
     sm-features: ''
 
+    # Elasticsearch attribute
+    elasticsearch-attribute: 'disabled'
+
     # CSIT images configuration
-    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
-    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200801-010144.168
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781
 
     # Default Robot framework options
     robot-options: ''
@@ -95,9 +100,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/neon
+    verify-branch: stable/sodium
     # Value for ODL_STREAM
-    verify-stream: neon
+    verify-stream: sodium
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
@@ -183,15 +188,60 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-mri-list-silicon: >
+        controller-csit-1node-akka1-all-silicon,
+        controller-csit-1node-benchmark-all-silicon,
+        controller-csit-1node-rest-cars-perf-all-silicon,
+        controller-csit-3node-benchmark-all-silicon,
+        controller-csit-3node-clustering-ask-all-silicon,
+        controller-csit-3node-clustering-tell-all-silicon,
+        controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
+        controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
+        yangtools-csit-1node-system-only-silicon
+    csit-mri-list-aluminium: >
+        controller-csit-1node-akka1-all-aluminium,
+        controller-csit-1node-benchmark-all-aluminium,
+        controller-csit-1node-rest-cars-perf-all-aluminium,
+        controller-csit-3node-benchmark-all-aluminium,
+        controller-csit-3node-clustering-ask-all-aluminium,
+        controller-csit-3node-clustering-tell-all-aluminium,
+        controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
+        controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
+        yangtools-csit-1node-system-only-aluminium
+    csit-mri-list-magnesium: >
+        yangtools-csit-1node-system-only-magnesium
+    csit-mri-list-sodium: >
+        yangtools-csit-1node-system-only-sodium
+    csit-sanity-list-silicon: >
+        openflowplugin-csit-1node-sanity-only-silicon,
+        distribution-sanity-silicon
+    csit-sanity-list-aluminium: >
+        openflowplugin-csit-1node-sanity-only-aluminium,
+        distribution-sanity-aluminium
     csit-sanity-list-magnesium: >
         openflowplugin-csit-1node-sanity-only-magnesium,
         distribution-sanity-magnesium
     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-weekly-list-silicon: >
+        controller-csit-1node-notifications-longevity-only-silicon,
+        controller-csit-3node-drb-partnheal-longevity-only-silicon,
+        controller-csit-3node-drb-precedence-longevity-only-silicon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon,
+        bgpcep-csit-3node-bgpclustering-longevity-only-silicon,
+        distribution-deploy-silicon,
+        distribution-offline-silicon,
+        openflowplugin-csit-1node-longevity-only-silicon
+    csit-weekly-list-aluminium: >
+        controller-csit-1node-notifications-longevity-only-aluminium,
+        controller-csit-3node-drb-partnheal-longevity-only-aluminium,
+        controller-csit-3node-drb-precedence-longevity-only-aluminium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
+        distribution-deploy-aluminium,
+        distribution-offline-aluminium,
+        openflowplugin-csit-1node-longevity-only-aluminium
     csit-weekly-list-magnesium: >
         controller-csit-1node-notifications-longevity-only-magnesium,
         controller-csit-3node-drb-partnheal-longevity-only-magnesium,
@@ -210,12 +260,3 @@
         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,
-        controller-csit-3node-drb-precedence-longevity-only-neon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
-        distribution-deploy-neon,
-        distribution-offline-neon,
-        openflowplugin-csit-1node-longevity-only-neon