Remove nitrogen branches in projects

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 2bd15c025b8434fb026c0148556c6587efcadd5c..cb3eec201424acf9b0a46d121903f26eed3d597e 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,54 +1,36 @@
 ---
 - project:
-    name: daexim-oxygen
+    name: daexim-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-nitrogen
+    name: daexim-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: oxygen
+    branch: 'stable/oxygen'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
@@ -62,5 +44,4 @@
     project-name: 'daexim'
     branch: 'master'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'