Update dluxapps jobs

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

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index da00339d9bd59f9fc84af55aa0c8a9cbc41bb3f3..2f4b2420831173c6ad15815a54d4bc505c359056 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,89 +1,59 @@
 ---
 - project:
-    name: dluxapps-sodium
+    name: dluxapps-master
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: sodium
-    branch: 'master'
+    project: "dluxapps"
+    project-name: "dluxapps"
+    stream: master
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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-neon
+    name: dluxapps-release-management
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: neon
-    branch: 'stable/neon'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    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-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: fluorine
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-oxygen
+    name: dluxapps-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
+      - gerrit-maven-sonar
 
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    project: "dluxapps"
+    project-name: "dluxapps"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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
+    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:
-      - gerrit-maven-sonar
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-info-yaml-verify
+    project: dluxapps
+    project-name: dluxapps
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dluxapps-view