X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=7c1c0065cb1234fa7c94fcde958b635de94d5962;hb=839a6f4ab6c3b6a65821539e616862a88d203d33;hp=86b12f343e7ab4812ffc67e6313fc76b60b03cb4;hpb=d39d37b3aeed4852cf3ed9d34fa103ad40c51494;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 86b12f343..7c1c0065c 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: sxp-nitrogen
+    name: sxp-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -27,21 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: sxp-carbon
+    name: sxp-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -56,19 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: sxp-boron
+    name: sxp-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
@@ -84,23 +79,21 @@
     archive-artifacts: ''
 
 - project:
-    name: sxp-beryllium
+    name: sxp-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
     karaf-version: karaf3
-    jdk: openjdk7
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: