X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fsfc%2Fsfc.yaml;h=1862cf8fc05c47000d7fc7d0e7b796675623fa8b;hb=c5c955aa61278e1ea56f08d5fb626528373bb53b;hp=b160c492eff0ffb579e268b69012537773fb750e;hpb=cd84a5a646dd2a64785e1b6ddd435db53695f26f;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index b160c492e..1862cf8fc 100644
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,101 +1,104 @@
 ---
 - project:
-    name: sfc-sodium
+    name: sfc-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'master'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: silicon
+    project: "sfc"
+    project-name: "sfc"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 120
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-neon
+    name: sfc-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: neon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/neon'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: aluminium
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 120
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-fluorine
+    name: sfc-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/fluorine'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: magnesium
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 120
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-oxygen
+    name: sfc-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/oxygen'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: sodium
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/sodium"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 120
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"
     build-node: centos7-builder-8c-8g
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -104,11 +107,25 @@
     name: sfc-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'master'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+
+- project:
+    name: sfc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sfc
+    project-name: sfc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sfc-view