X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Finfrautils%2Finfrautils.yaml;h=98b2fb30e8b99b1cb43ce1a5a1573c12ee91fda0;hb=1d36777edc423e8a9d04d3206a4d3ed3f4f61ea4;hp=dc6294200695fa84e2b8d77d733f16ff93a5d162;hpb=d190af926c7c0ef098c635fdae5b62350babffcc;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index dc6294200..98b2fb30e 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,66 +1,125 @@
 ---
 - project:
-    name: infrautils-fluorine
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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: fluorine
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    stream: master
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "master"
+    java-version: "openjdk11"
+    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-oxygen
+    name: infrautils-1.8.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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: oxygen
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/oxygen'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    stream: aluminium
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "1.8.x"
+    java-version: "openjdk11"
+    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-magnesium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    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-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:
-      - gerrit-maven-sonar
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
-- view:
-    name: infrautils
-    description: 'List of infrautils jobs'
-    regex: '^infrautils-.*'
-    <<: *releng_view_common
+    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
+    views:
+      - project-view
+    project-name: infrautils