Merge "Update cloud image Ubuntu18.04 mininet ovs"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index af9a9437c45784cfc3c134d2bf5ce8ad26e79796..2f5b1d0f3dcc7d033a455b66e99f978839199a65 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,20 +101,19 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520"
     openstack_system2_count: 0
     openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220201-180056.429"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740"
-    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20221201-180114.186"
+    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221016-222956.928"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20221101-000109.537"
 
     # Default Robot framework options
     robot-options: ""
@@ -125,9 +124,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/phosphorus
+    verify-branch: stable/sulfur
     # Value for ODL_STREAM
-    verify-stream: phosphorus
+    verify-stream: sulfur
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk11
 
@@ -213,37 +212,6 @@
     10-exclude-value: ""
 
     # Manual CSIT job lists used by sanity or periodic in nature.
-    csit-mri-list-phosphorus: >
-      aaa-csit-1node-authn-all-phosphorus,
-      controller-csit-1node-akka1-all-phosphorus,
-      controller-csit-1node-benchmark-all-phosphorus,
-      controller-csit-1node-rest-cars-perf-all-phosphorus,
-      controller-csit-3node-benchmark-all-phosphorus,
-      controller-csit-3node-clustering-ask-all-phosphorus,
-      controller-csit-3node-clustering-tell-all-phosphorus,
-      controller-csit-3node-rest-clust-cars-perf-ask-only-phosphorus,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-phosphorus,
-      mdsal-csit-3node-netty-replicate-only-phosphorus,
-      netconf-csit-1node-callhome-only-master,
-      netconf-csit-1node-scale-max-devices-only-master,
-      netconf-csit-1node-scale-only-master,
-      netconf-csit-1node-userfeatures-all-master,
-      netconf-csit-1node-userfeatures-rfc8040-all-master,
-      netconf-csit-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master,
-      yangtools-csit-1node-system-only-phosphorus
-    csit-weekly-list-phosphorus: >
-      controller-csit-1node-notifications-longevity-only-phosphorus,
-      controller-csit-3node-drb-partnheal-longevity-only-phosphorus,
-      controller-csit-3node-drb-precedence-longevity-only-phosphorus,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-phosphorus,
-      bgpcep-csit-3node-bgpclustering-longevity-only-phosphorus,
-      distribution-deploy-phosphorus,
-      distribution-offline-phosphorus,
-      openflowplugin-csit-1node-longevity-only-phosphorus
-    csit-sanity-list-phosphorus: >
-      openflowplugin-csit-1node-sanity-only-phosphorus,
-      distribution-sanity-phosphorus
     csit-mri-list-sulfur: >
       aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur,
       controller-csit-1node-benchmark-all-sulfur,
@@ -305,3 +273,34 @@
     csit-sanity-list-chlorine: >
       openflowplugin-csit-1node-sanity-only-chlorine,
       distribution-sanity-chlorine
+    csit-mri-list-argon: >
+      aaa-csit-1node-authn-all-argon,
+      controller-csit-1node-akka1-all-argon,
+      controller-csit-1node-benchmark-all-argon,
+      controller-csit-1node-rest-cars-perf-all-argon,
+      controller-csit-3node-benchmark-all-argon,
+      controller-csit-3node-clustering-ask-all-argon,
+      controller-csit-3node-clustering-tell-all-argon,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-argon,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-argon,
+      mdsal-csit-3node-netty-replicate-only-argon,
+      netconf-csit-1node-callhome-only-master,
+      netconf-csit-1node-scale-max-devices-only-master,
+      netconf-csit-1node-scale-only-master,
+      netconf-csit-1node-userfeatures-all-master,
+      netconf-csit-1node-userfeatures-rfc8040-all-master,
+      netconf-csit-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master,
+      yangtools-csit-1node-system-only-master
+    csit-weekly-list-argon: >
+      controller-csit-1node-notifications-longevity-only-argon,
+      controller-csit-3node-drb-partnheal-longevity-only-argon,
+      controller-csit-3node-drb-precedence-longevity-only-argon,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-argon,
+      bgpcep-csit-3node-bgpclustering-longevity-only-argon,
+      distribution-deploy-argon,
+      distribution-offline-argon,
+      openflowplugin-csit-1node-longevity-only-argon
+    csit-sanity-list-argon: >
+      openflowplugin-csit-1node-sanity-only-argon,
+      distribution-sanity-argon