Merge "Update cloud image"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 311b026bfeb075c7ffb1daf156a96b8870519ac2..c54c963a6a84e31cf8c2d52addb109d44fa5b73b 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -125,9 +125,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/silicon
+    verify-branch: stable/phosphorus
     # Value for ODL_STREAM
-    verify-stream: silicon
+    verify-stream: phosphorus
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk11
 
@@ -213,37 +213,6 @@
     10-exclude-value: ""
 
     # Manual CSIT job lists used by sanity or periodic in nature.
-    csit-mri-list-silicon: >
-      aaa-csit-1node-authn-all-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,
-      mdsal-csit-3node-netty-replicate-only-silicon,
-      netconf-csit-1node-callhome-only-silicon,
-      netconf-csit-1node-scale-max-devices-only-silicon,
-      netconf-csit-1node-scale-only-silicon,
-      netconf-csit-1node-userfeatures-all-silicon,
-      netconf-csit-1node-userfeatures-rfc8040-all-silicon,
-      netconf-csit-3node-clustering-only-silicon,
-      netconf-csit-3node-clustering-scale-only-silicon,
-      yangtools-csit-1node-system-only-silicon
-    csit-sanity-list-silicon: >
-      openflowplugin-csit-1node-sanity-only-silicon,
-      distribution-sanity-silicon
-    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-mri-list-phosphorus: >
       aaa-csit-1node-authn-all-phosphorus,
       controller-csit-1node-akka1-all-phosphorus,
@@ -277,39 +246,62 @@
       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, controller-csit-1node-rest-cars-perf-all-sulfur,
+      controller-csit-1node-benchmark-all-sulfur,
+      controller-csit-1node-rest-cars-perf-all-sulfur,
       controller-csit-3node-benchmark-all-sulfur,
-      controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur,
+      controller-csit-3node-clustering-ask-all-sulfur,
+      controller-csit-3node-clustering-tell-all-sulfur,
       controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur,
       controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur,
-      mdsal-csit-3node-netty-replicate-only-sulfur, 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,
+      mdsal-csit-3node-netty-replicate-only-sulfur,
+      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-sulfur
     csit-weekly-list-sulfur: >
       controller-csit-1node-notifications-longevity-only-sulfur,
       controller-csit-3node-drb-partnheal-longevity-only-sulfur,
       controller-csit-3node-drb-precedence-longevity-only-sulfur,
       controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur,
-      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur,
-      distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur
+      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur,
+      distribution-deploy-sulfur,
+      distribution-offline-sulfur,
+      openflowplugin-csit-1node-longevity-only-sulfur
     csit-sanity-list-sulfur: >
-      openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur
+      openflowplugin-csit-1node-sanity-only-sulfur,
+      distribution-sanity-sulfur
     csit-mri-list-chlorine: >
-      aaa-csit-1node-authn-all-chlorine, controller-csit-1node-akka1-all-chlorine,
-      controller-csit-1node-benchmark-all-chlorine, controller-csit-1node-rest-cars-perf-all-chlorine,
-      controller-csit-3node-benchmark-all-chlorine, controller-csit-3node-clustering-ask-all-chlorine,
-      controller-csit-3node-clustering-tell-all-chlorine, controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, mdsal-csit-3node-netty-replicate-only-chlorine,
-      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-chlorine
+      aaa-csit-1node-authn-all-chlorine,
+      controller-csit-1node-akka1-all-chlorine,
+      controller-csit-1node-benchmark-all-chlorine,
+      controller-csit-1node-rest-cars-perf-all-chlorine,
+      controller-csit-3node-benchmark-all-chlorine,
+      controller-csit-3node-clustering-ask-all-chlorine,
+      controller-csit-3node-clustering-tell-all-chlorine,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine,
+      mdsal-csit-3node-netty-replicate-only-chlorine,
+      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-chlorine
     csit-weekly-list-chlorine: >
-      controller-csit-1node-notifications-longevity-only-chlorine, controller-csit-3node-drb-partnheal-longevity-only-chlorine,
-      controller-csit-3node-drb-precedence-longevity-only-chlorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine,
-      bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, distribution-deploy-chlorine,
-      distribution-offline-chlorine, openflowplugin-csit-1node-longevity-only-chlorine
+      controller-csit-1node-notifications-longevity-only-chlorine,
+      controller-csit-3node-drb-partnheal-longevity-only-chlorine,
+      controller-csit-3node-drb-precedence-longevity-only-chlorine,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine,
+      bgpcep-csit-3node-bgpclustering-longevity-only-chlorine,
+      distribution-deploy-chlorine,
+      distribution-offline-chlorine,
+      openflowplugin-csit-1node-longevity-only-chlorine
     csit-sanity-list-chlorine: >
-      openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine
+      openflowplugin-csit-1node-sanity-only-chlorine,
+      distribution-sanity-chlorine