X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdluxapps%2Fdluxapps.yaml;h=dff786c0bd10c6e6657e0a336cf4f0c35df43373;hb=da0b2ccf55025f35eb911a6aff7448f28fd7c3fd;hp=5fe9eee1907b7ae0c9d4b3f3a7567006fb35b5ac;hpb=ef0e518dd152a35e717bae341906b7b8e94b34c7;p=releng%2Fbuilder.git

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 5fe9eee19..dff786c0b 100644
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,80 +1,50 @@
 ---
 - project:
-    name: dluxapps-aluminium
+    name: dluxapps-master
     jobs:
-      - gerrit-release-merge
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: aluminium
-    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-magnesium
-    jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: magnesium
-    branch: 'stable/magnesium'
+    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]'
+    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-sodium
+    name: dluxapps-release-management
     jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: sodium
-    branch: 'stable/sodium'
-    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
+    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-sonar
     jobs:
       - gerrit-maven-sonar
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    branch: 'master'
+    project: "dluxapps"
+    project-name: "dluxapps"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: dluxapps-info