X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdlux%2Fdlux.yaml;h=68e1038b8a1f294b644b4451e54330ddece012e6;hb=105fb5fcaa598d3f2740b4545dc4597fc31d1eaa;hp=f342bf494b59c3c21b396ccc43a633cb886f3521;hpb=fc9bf069d4ffa62713ebc403d891e826cd705568;p=releng%2Fbuilder.git

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index f342bf494..68e1038b8 100644
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,82 +1,72 @@
 ---
 - project:
-    name: dlux-sodium
+    name: dlux-magnesium
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    stream: magnesium
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "dlux-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[dlux] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-neon
+    name: dlux-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/neon'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    stream: sodium
+    project: "dlux"
+    project-name: "dlux"
+    branch: "stable/sodium"
+    mvn-settings: "dlux-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[dlux] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-fluorine
+    name: dlux-release-management
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    stream: fluorine
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/fluorine'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    project: dlux
+    project-name: dlux
 
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
+    build-node: centos7-builder-2c-1g
+    mvn-settings: dlux-settings
 
 - project:
-    name: dlux-oxygen
+    name: dlux-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/oxygen'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
+      - gerrit-maven-sonar
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    mvn-settings: "dlux-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: dlux-sonar
+    name: dlux-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-info-yaml-verify
+    project: dlux
+    project-name: dlux
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dlux-view