X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fsxp%2Fsxp.yaml;h=390ecdaf896d15e5b9e3f1dd08246f8bfc4fe3c8;hb=b5a16be5c91f0971e492c20b389057ac29526789;hp=5f6c3bdddc812ffdf0b22dad06f19526f098af8e;hpb=79c0ee538aea4c11720752b23f5416a344f30d2e;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 5f6c3bddd..390ecdaf8 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,112 +1,147 @@
 ---
 - project:
-    name: sxp-sodium
+    name: sxp-silicon
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: "openjdk11"
 
-    stream: sodium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
+    stream: silicon
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
 
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-aluminium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: "openjdk11"
 
-    stream: neon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/neon'
+    stream: aluminium
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/aluminium"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
 
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-fluorine
+    name: sxp-magnesium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    java-version: "openjdk11"
 
-    stream: fluorine
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    stream: magnesium
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/magnesium"
+
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
+
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-oxygen
+    name: sxp-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/oxygen'
+    java-version:
+      - openjdk8
+
+    stream: sodium
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/sodium"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
 
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    disable-job: true
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
+- project:
+    name: sxp-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: sxp
+    project-name: sxp
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: sxp-settings
+
 - project:
     name: sxp-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sxp-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: sxp-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sxp
+    project-name: sxp
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sxp-view