Merge "Remove odlmicro CSIT from AR test"

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 034ec5a0ee5d2c32a6085ae2a7bc9ef42dea5ff1..5cc8f45deab276204219ea5e965c462b24e2db46 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -64,8 +64,8 @@
       - silicon:
           branch: "master"
           csit-blocklist: >
-            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
@@ -80,8 +80,8 @@
       - aluminium:
           branch: "stable/aluminium"
           csit-blocklist: >
-            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index 4f464e9285ddac2df8a62f24ee3daae7d4de1100..d425bc8c7f59fdf86ad683b29cc06da9efa5700e 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -17,6 +17,7 @@
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf"
+          trigger-jobs: "odlmicro-maven-merge-{stream}"
           robot-options: >
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
@@ -25,6 +26,7 @@
           branch: "stable/aluminium"
           jre: "openjdk11"
           functionality: "netconf"
+          trigger-jobs: "odlmicro-maven-merge-{stream}"
           robot-options: >
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT