Merge "Remove of-config carbon jobs"

[releng/builder.git] / jjb / tsdr / tsdr.yaml

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 841919211d2b82a55f4ee2b096e177447795ad25..2fe38b4c17b25829174cad38ef3a5987ec279dfd 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,67 +1,53 @@
 ---
 - project:
-    name: tsdr-oxygen
+    name: tsdr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-nitrogen
+    name: tsdr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-carbon
+    name: tsdr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    branch: 'stable/nitrogen'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c