Enable dlux jobs

This is to verify internship work on dlux.

Change-Id: I5f5ac22aec930af8ee889d2c5def6dd02188d3b2
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index ed0259c124c44832c4e092cfce62ef231f4110cc..ac8d117c1b8db51404e8aa3ed70fb1173079a657 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,77 +1,19 @@
 ---
-- project:
-    name: dlux-magnesium
-    jobs:
-      - gerrit-release-merge
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/sodium'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
 - project:
     name: dlux-neon
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: neon
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/neon'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-fluorine
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/fluorine'
+    branch: 'master'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -85,7 +27,6 @@
     branch: 'master'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m'
-    disable-job: true
 
 - project:
     name: dlux-view