X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdluxapps%2Fdluxapps.yaml;h=b51bb653fa9cb8e6ecc6bdf710afede5295a5c44;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=b9cdd978b237a4fae076b4bc102dd0a9b51def06;hpb=4b919f23a7f21163c4177f578c6744bad87b05f7;p=releng%2Fbuilder.git

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index b9cdd978b..b51bb653f 100644
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -4,24 +4,17 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    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
@@ -31,24 +24,17 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{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-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
@@ -58,25 +44,18 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: carbon
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    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
@@ -84,11 +63,11 @@
 - 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'