X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=4ebffb44781afad67fbf1c6f44ef8da52b54c54f;hb=5fdd3e5e79e4646b041203e7219729617d5e676f;hp=d0a2349f8b64110fc7279fadc27021280beef608;hpb=fbb6852790ef13e01d614200cf9c9ac821105ef5;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d0a2349f8..4ebffb447 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,48 +1,23 @@
 ---
 - project:
-    name: infrautils-magnesium
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - 'gerrit-release-merge':
           build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: infrautils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
-          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
-- project:
-    name: infrautils-sodium
-    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
           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: master
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/sodium'
+    branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -52,7 +27,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-neon
+    name: infrautils-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -62,13 +37,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: neon
+    stream: magnesium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -78,7 +54,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-fluorine
+    name: infrautils-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -91,10 +67,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -110,8 +86,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