Merge "Update cloud image Ubuntu18.04 docker x86_64"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index a220f8d6f871a55150cd1760327badfe20abf4f5..0c47a7d32e52e62d1a21a10f13e2120b12e19eb1 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,
@@ -240,6 +248,7 @@
       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,
       controller-csit-1node-benchmark-all-phosphorus,
       controller-csit-1node-rest-cars-perf-all-phosphorus,
@@ -249,6 +258,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 72d749bdcdc049488c4993c9a578792a1cff6c6d..1ea80ad64ec60e31d74d80599423407d0fc571d6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -64,8 +64,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
@@ -77,8 +77,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