X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdluxapps%2Fdluxapps.yaml;h=85aefe9de3fafb1b6dd2f4859b6ae895c812c598;hb=636c5ba5fe1f39ea6e7ad9f763a0371e4d4808c4;hp=b9cdd978b237a4fae076b4bc102dd0a9b51def06;hpb=9d6b1af33712fcff4809bfba04c5e80a4ac8a3b6;p=releng%2Fbuilder.git

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index b9cdd978b..2f4b24208 100644
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,94 +1,62 @@
 ---
 - project:
-    name: dluxapps-oxygen
+    name: dluxapps-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: oxygen
-    branch: 'master'
-    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: ''
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    project: "dluxapps"
+    project-name: "dluxapps"
+    stream: master
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-nitrogen
+    name: dluxapps-release-management
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-release-merge
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    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: ''
+    project: dluxapps
+    project-name: dluxapps
 
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
+    build-node: centos7-builder-2c-1g
+    mvn-settings: dluxapps-settings
 
 - project:
-    name: dluxapps-carbon
+    name: dluxapps-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: carbon
-    branch: 'stable/carbon'
-    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
+      - gerrit-maven-sonar
+
+    project: "dluxapps"
+    project-name: "dluxapps"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
-    name: dluxapps-sonar
+    name: dluxapps-info
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-info-yaml-verify
+    project: dluxapps
+    project-name: dluxapps
+    branch: master
+    build-node: centos7-builder-2c-1g
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    branch: 'master'
-    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'
+- project:
+    name: dluxapps-view
+    views:
+      - project-view
+    project-name: dluxapps