Update cloud image CentOS7 builder x86_64

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 21f69a25773d7403369bd0ab691facd6d8280b3c..80636a7749ed00c1bfaf6f69c89155def1378ea6 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,7 +101,7 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20211001-123242.814"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -112,8 +112,8 @@
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
     tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760"
+    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"
 
     # Default Robot framework options
@@ -125,11 +125,11 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/aluminium
+    verify-branch: stable/silicon
     # Value for ODL_STREAM
-    verify-stream: aluminium
+    verify-stream: silicon
     verify-karaf-version: karaf4
-    verify-jdkversion: openjdk8
+    verify-jdkversion: openjdk11
 
     # Maven / Java
     java-version: "openjdk8"
@@ -232,23 +232,9 @@
       netconf-csit-3node-clustering-only-silicon,
       netconf-csit-3node-clustering-scale-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,
-      mdsal-csit-3node-netty-replicate-only-aluminium,
-      yangtools-csit-1node-system-only-aluminium
     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-weekly-list-silicon: >
       controller-csit-1node-notifications-longevity-only-silicon,
       controller-csit-3node-drb-partnheal-longevity-only-silicon,
@@ -258,15 +244,6 @@
       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-mri-list-phosphorus: >
       aaa-csit-1node-authn-all-phosphorus,
       controller-csit-1node-akka1-all-phosphorus,