From: Robert Varga Date: Fri, 24 Jul 2020 15:43:07 +0000 (+0200) Subject: Switch infrautils to being MRI X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=efa4155996d71919c497e1e2431ec0f13985e1ae;p=releng%2Fbuilder.git Switch infrautils to being MRI infrautils is now a MRI project: - use 'master' instead of 'aluminium' to keep job continuity - remove infrautils-distribution-check-aluminium - do not trigger distribution-merge in aluminium Change-Id: Ibc7c9c288b17a2f1dc28d08ef6b6dab6836cb5c1 Signed-off-by: Robert Varga --- diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 64b4de6c9..4ebffb447 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,8 +1,7 @@ --- - project: - name: infrautils-aluminium + name: infrautils-master jobs: - - '{project-name}-distribution-check-{stream}' - 'gerrit-release-merge': build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': @@ -14,7 +13,7 @@ - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: master project: 'infrautils' project-name: 'infrautils' branch: 'master' diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 3e7c8f6a9..36dd6ba9b 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -73,7 +73,6 @@ bgpcep-maven-merge-{stream}, daexim-maven-merge-{stream}, genius-maven-merge-{stream}, - infrautils-maven-merge-{stream}, jsonrpc-maven-merge-{stream}, lispflowmapping-maven-merge-{stream}, netconf-maven-merge-{stream},