X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdluxapps%2Fdluxapps.yaml;h=6cd7760b2a784e073628a3ec7068277f68481fd8;hb=d2dbe00f26c3fd709f069d917b6d466d7bda4115;hp=aaaf1e7c3954ebc1ed4445eea5e49a3e06c845df;hpb=d39d37b3aeed4852cf3ed9d34fa103ad40c51494;p=releng%2Fbuilder.git

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index aaaf1e7c3..6cd7760b2 100644
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,68 +1,89 @@
 ---
+- project:
+    name: dluxapps-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: fluorine
+    branch: 'master'
+    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-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    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]'
+
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-nitrogen
     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}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: nitrogen
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     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
     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}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: carbon
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     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-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'