X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=34288d0f4e061d64c74bf6b5d4bf8aab2c8bdf44;hb=2b6b1d3d15aa11e8f99900821f54fcadfab96904;hp=5f6c3bdddc812ffdf0b22dad06f19526f098af8e;hpb=807fca79b9cbd070495690797e1b0cc019caf5f9;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 5f6c3bddd..34288d0f4 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-sodium
+    name: sxp-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -8,12 +8,14 @@
           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:
       - openjdk8
       - openjdk11
 
-    stream: sodium
+    stream: magnesium
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -28,7 +30,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -36,15 +38,16 @@
           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
 
-    stream: neon
+    stream: sodium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -56,7 +59,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-fluorine
+    name: sxp-neon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -64,13 +67,20 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    java-version:
+      - openjdk8
+      - openjdk11
+
+    stream: neon
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
+
     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]'
 
@@ -78,22 +88,24 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-oxygen
+    name: sxp-fluorine
     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
+    stream: fluorine
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/oxygen'
-
+    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]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6909c75719b7