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 6d2bc4505ba0868907d19c7ee04393003d3a07c6..ca850310b6221f86969c6fbf4cf8205a670cef8f 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,76 +1,37 @@
 ---
 - project:
-    name: dluxapps-oxygen
+    name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    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]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-carbon
+    name: dluxapps-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: oxygen
+    branch: 'stable/oxygen'
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
@@ -83,5 +44,6 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'