From b47229b66108b2d5538765effd841ad09647319f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 1 Feb 2021 23:31:19 +0100 Subject: [PATCH] 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 --- jjb/genius/genius.yaml | 1 - jjb/integration/distribution/distribution-jobs.yaml | 1 - jjb/integration/integration-test-jobs.yaml | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 0959fa9648..85afc5bafc 100644 --- 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 3a7992846a..40d84f9695 100644 --- 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 682ac76f92..9e72fb80e5 100644 --- 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 -- 2.36.6