Remove nitrogen branches in projects

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

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