X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=c72d953826e2fd56a292177e7d41baad9306ab97;hb=4b613ade290b72376eb514af803df1a335752853;hp=b09ced73f36b777d17d551ff1570673e0aa4da01;hpb=10c39fabd0ba410146763aa0d2927752e92e1013;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b09ced73f..c72d95382 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -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,