Fix missing integration-test jobs

The stable/argon branch cut done in
440bc45d10009b58a41968ae13a4eb5a7d408a24 failed to instantiate all test
jobs. Fix that up.

Change-Id: I77b06fa31a917775ae36053803f32c45efb8d3c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 494d1295ed2ea741fb99dc9157c34d3addde24bf..34df9947eab4cb45fe9795e5f3ced4e30a5be504 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -272,3 +272,33 @@
     csit-sanity-list-argon: >
       openflowplugin-csit-1node-sanity-only-argon,
       distribution-sanity-argon
+    csit-mri-list-potassium: >
+      aaa-csit-1node-authn-all-potassium,
+      controller-csit-1node-akka1-all-potassium,
+      controller-csit-1node-benchmark-all-potassium,
+      controller-csit-1node-rest-cars-perf-all-potassium,
+      controller-csit-3node-benchmark-all-potassium,
+      controller-csit-3node-clustering-ask-all-potassium,
+      controller-csit-3node-clustering-tell-all-potassium,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-potassium,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-potassium,
+      mdsal-csit-3node-netty-replicate-only-potassium,
+      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-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master,
+      yangtools-csit-1node-system-only-master
+    csit-weekly-list-potassium: >
+      controller-csit-1node-notifications-longevity-only-potassium,
+      controller-csit-3node-drb-partnheal-longevity-only-potassium,
+      controller-csit-3node-drb-precedence-longevity-only-potassium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-potassium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-potassium,
+      distribution-deploy-potassium,
+      distribution-offline-potassium,
+      openflowplugin-csit-1node-longevity-only-potassium
+    csit-sanity-list-potassium: >
+      openflowplugin-csit-1node-sanity-only-potassium,
+      distribution-sanity-potassium

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 233a1e730fd73b6b3aa8db4f5111e9acc1356351..aaae01162e481b3a98491cbc816d7b9dfb312743 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -55,8 +55,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+          csit-blocklist: >
+            aaa controller genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-potassium.lst
+          csit-mri-list: "{csit-mri-list-potassium}"
+          csit-weekly-list: "{csit-weekly-list-potassium}"
+      - argon:
+          branch: "stable/argon"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -90,9 +103,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-potassium}"
+      - argon:
+          branch: "stable/argon"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-argon}"
       - chlorine:
           branch: "stable/chlorine"