Switch Genius to self-managed mode

Remove glue jobs between integration/{distribution,test} which are
preconditioned on being in managed distribution.

Change-Id: Id8628eaff9c65ad12319205cb00ad8f45af9c769
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 0959fa964816dc3cff22700179fdc075b2ebeaa6..85afc5bafcbb85414cba268bcb05f7d06b5fd05f 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,7 +2,6 @@
 - project:
     name: genius-silicon
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3a7992846af14f19e8ed176f7373b5adc8eb2eeb..40d84f9695a471828ada4632bbd573267afefd3b 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -65,7 +65,6 @@
           dependencies: >
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 682ac76f92bfafa6714c6577b5e5a1af531619e5..9e72fb80e51f84cca44f00e2934907253850a4a9 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -26,7 +26,7 @@
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
       - aluminium:
@@ -64,7 +64,7 @@
       - silicon:
           branch: "master"
           csit-blocklist: >
-            bier controller dluxapps lispflowmapping l2switch mdsal nemo
+            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all