Split out release-merge job to separate project

[releng/builder.git] / jjb / infrautils / infrautils.yaml

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 6c1079c3972160be57ffb869f9b1748f8d41f496..d156c1eaac540eeaa0065b2ff36771e48384c966 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,9 +1,7 @@
 ---
 - project:
-    name: infrautils-aluminium
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -13,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: master
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
@@ -79,6 +77,17 @@
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
+- project:
+    name: infrautils-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: infrautils
+    project-name: infrautils
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: infrautils-settings
+
 - project:
     name: infrautils-sonar
     jobs:
@@ -89,6 +98,19 @@
     java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: infrautils-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: infrautils
+    project-name: infrautils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: infrautils-view