Drop controller-sonar to 4c-4g

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 85b10ed39b52aa413c04c9576b4b160445797a5e..2edafdf1bd99f4ae9cb456e6b9dd88de2d1a2d74 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -99,9 +99,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
 
@@ -187,15 +187,30 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-mri-list-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-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-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,
@@ -214,12 +229,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