X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftsdr%2Ftsdr.yaml;h=70637d4f91c5f58399dc921ba8ca8b55f69f22e3;hb=65d7b135390288023d44b59dca789e3883afa04d;hp=127d46273d6e9e670009208ae2c5bdea915ba1cd;hpb=3bd9ebb49a35331d940bb837bae8fd9d5c8040b8;p=releng%2Fbuilder.git

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 127d46273..70637d4f9 100644
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: tsdr-nitrogen
+    name: tsdr-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: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -27,19 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: tsdr-carbon
+    name: tsdr-nitrogen
     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: carbon
+    stream: nitrogen
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/carbon'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,19 +52,19 @@
     archive-artifacts: ''
 
 - project:
-    name: tsdr-boron
+    name: tsdr-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: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -81,22 +79,21 @@
     archive-artifacts: ''
 
 - project:
-    name: tsdr-beryllium
+    name: tsdr-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: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: