X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=bf679d201c0d6e1d4240de213ab8e532ca10c120;hb=a9e649d2bc340065b51d358c3bfd507c506b6aa6;hp=0dd9a4aef619aa1f6e9121112437f883910ba0bb;hpb=807fca79b9cbd070495690797e1b0cc019caf5f9;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 0dd9a4aef..bf679d201 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,114 +1,90 @@
 ---
 - project:
-    name: infrautils-sodium
+    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: sodium
-    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-neon
+    name: infrautils-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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: neon
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/neon'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    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-fluorine
+    name: infrautils-release-management
     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
+      - gerrit-release-merge
 
-    stream: fluorine
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/fluorine'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    project: infrautils
+    project-name: infrautils
 
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
+    build-node: centos7-builder-2c-1g
+    mvn-settings: infrautils-settings
 
 - project:
-    name: infrautils-oxygen
+    name: infrautils-sonar
     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
-
-    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]'
-    disable-job: 'true'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
+      - gerrit-maven-sonar
+    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-sonar
+    name: infrautils-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-info-yaml-verify
+    project: infrautils
+    project-name: infrautils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: infrautils-view