X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdlux%2Fdlux.yaml;h=3a1a73e00a703dd50cb1b2fdee52fa09f9fefbe7;hb=f9510ad2361a13149cd478e9d0863d0efe3dd772;hp=00b31dc6677a1146ecb857bd6f6398273bfa051a;hpb=ece6a462c2e9580514d1e610d8f81c1e805e6685;p=releng%2Fbuilder.git

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 00b31dc66..3a1a73e00 100644
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: dlux-nitrogen
+    name: dlux-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
@@ -27,21 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: dlux-carbon
+    name: dlux-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -56,19 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: dlux-boron
+    name: dlux-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
@@ -83,35 +78,6 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: dlux-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'dlux'
-    project-name: 'dlux'
-    karaf-version: karaf3
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: dlux-sonar
     jobs: