Merge "Updating the Python pip packages"

[releng/builder.git] / jjb / dlux / dlux.yaml

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 7ab8fe8de20ecafd763e72490e7cf193d6d01738..c05f468072f5e00ba1ce77cfaa66a388403022cc 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,18 +2,18 @@
 - project:
     name: dlux-magnesium
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -29,48 +29,8 @@
     project-name: 'dlux'
     branch: 'stable/sodium'
     mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-neon
-    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]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-fluorine
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    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]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -83,8 +43,20 @@
     project-name: 'dlux'
     branch: 'master'
     mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    disable-job: true
+    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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dlux
+    project-name: dlux
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dlux-view