Remove nitrogen branches in projects

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

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index b92ebd1c78e7c4d218918a4730dc0e2b9aaace48..b52b0245cc9554f36c69711202812cf14836e432 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: ttp-oxygen
+    name: ttp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
@@ -18,34 +17,15 @@
     staging-profile-id: a693f948563d5
 
 - project:
-    name: ttp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
-- project:
-    name: ttp-carbon
+    name: ttp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'