X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=97a950be70c11b79d6da08c869dd8eebd379fcc4;hb=2153c12380225226da1a4488f439945046080f34;hp=d3859f04b104158b914618e6faa8ab76c138184c;hpb=a57ec46db9ccee91468eef1ed8cbae15bb971cec;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d3859f04b..97a950be7 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,9 +1,11 @@
 ---
 - project:
-    name: infrautils-magnesium
+    name: infrautils-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -11,15 +13,15 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
+    mvn-version: mvn36
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
@@ -28,7 +30,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-sodium
+    name: infrautils-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -38,13 +40,14 @@
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -54,7 +57,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-neon
+    name: infrautils-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -67,10 +70,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -86,8 +89,22 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
+    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