X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=d78ccf77eef9faa4d54464ebe7853277e75f979c;hb=2e490c48d15d9e18a62efc274e2df774a506f6b6;hp=ba2b58e15e5e64f202ecea7707a09b9d3db2666c;hpb=09112999fdb2604a82850233dbebfb033c361349;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index ba2b58e15..d78ccf77e 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,36 +1,35 @@
 ---
 - project:
-    name: sxp-aluminium
+    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
-      - gerrit-release-merge
 
-    java-version: 'openjdk11'
+    java-version: "openjdk11"
 
-    stream: aluminium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
+    stream: silicon
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    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-magnesium
+    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/
@@ -38,26 +37,26 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    java-version: 'openjdk11'
+    java-version: "openjdk11"
 
-    stream: magnesium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/magnesium'
+    stream: aluminium
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/aluminium"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    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-sodium
+    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/
@@ -65,37 +64,47 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
+    java-version: "openjdk11"
 
-    stream: sodium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/sodium'
+    stream: magnesium
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/magnesium"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    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-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'
-    java-version: 'openjdk11'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: sxp-info