Move aaa and netconf CSIT to MRI list

Change-Id: Ieca364ea350e091154e2c4e585955452817e7b17
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index a90c876a62d79a0faea7898eb69337e24bedd5f2..d9a7a1375cb61076fdf2da7c21c040a73e891128 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -194,6 +194,7 @@
 
     # 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,
@@ -203,6 +204,13 @@
       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-mri-list-aluminium: >
       controller-csit-1node-akka1-all-aluminium,
@@ -255,6 +263,7 @@
       distribution-offline-magnesium,
       openflowplugin-csit-1node-longevity-only-magnesium
     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,
@@ -264,6 +273,13 @@
       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-phosphorus,
+      netconf-csit-1node-scale-max-devices-only-phosphorus,
+      netconf-csit-1node-scale-only-phosphorus,
+      netconf-csit-1node-userfeatures-all-phosphorus,
+      netconf-csit-1node-userfeatures-rfc8040-all-phosphorus,
+      netconf-csit-3node-clustering-only-phosphorus,
+      netconf-csit-3node-clustering-scale-only-phosphorus,
       yangtools-csit-1node-system-only-phosphorus
     csit-weekly-list-phosphorus: >
       controller-csit-1node-notifications-longevity-only-phosphorus,

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 96389f490b1481e3a294fc4a749448854e5164f6..6f39b3be865988345727c3c1309a380220a99fa0 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -74,8 +74,8 @@
       - phosphorus:
           branch: "master"
           csit-blocklist: >
-            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
@@ -87,8 +87,8 @@
       - silicon:
           branch: "stable/silicon"
           csit-blocklist: >
-            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only