Remove nitrogen branches in projects

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

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index d87fdb4c7e3be2d087d2f7d9427b163ca770e900..ca850310b6221f86969c6fbf4cf8205a670cef8f 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,13 +1,12 @@
 ---
 - project:
-    name: dluxapps-oxygen
+    name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
@@ -19,36 +18,16 @@
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-carbon
+    name: dluxapps-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: carbon
-    branch: 'stable/carbon'
+    stream: oxygen
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'