CI: Remove odltools jobs and config

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index fd9b0d9ee257bd50a0236edd3a8c080d97026ee0..d22698d0f73bbf038bcb93bf991236f18d81cac8 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,68 +1,55 @@
 ---
 - project:
-    name: dlux-sodium
+    name: dlux-master
     jobs:
-      - odl-maven-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]'
-    disable-job: true
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: master
+    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-release-management
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    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
+    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-fluorine
+    name: dlux-sonar
     jobs:
-      - odl-maven-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
+      - 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'
-    disable-job: true
+      - gerrit-info-yaml-verify
+    project: dlux
+    project-name: dlux
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dlux-view