Split out release-merge job to separate project

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

diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
index cfe818f3734cd72daa3e437ea3ebb4a29331f2a2..7fe2ab15d8911be2955a4d0d53134d4849510ed4 100644 (file)
--- a/jjb/odlguice/odlguice.yaml
+++ b/jjb/odlguice/odlguice.yaml
@@ -1,25 +1,82 @@
 ---
 - project:
-    name: odlguice
+    name: odlguice-silicon
     jobs:
-      - gerrit-release-merge
-      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream:
-      - aluminium:
-          branch: 'master'
-      - magnesium:
-          branch: 'stable/magnesium'
+    stream: silicon
+    project: 'odlguice'
+    project-name: 'odlguice'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'odlguice-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
 
-    project: odlguice
-    project-name: odlguice
+    # Used by the release job
+    staging-profile-id: 44ce7d1aad49e
+
+- project:
+    name: odlguice-aluminium
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'odlguice'
+    project-name: 'odlguice'
     build-node: centos7-builder-2c-2g
-    build-timeout: 60
+    build-timeout: 120
+    branch: 'stable/aluminium'
+    java-version: 'openjdk11'
     mvn-settings: 'odlguice-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e
 
+- project:
+    name: odlguice-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: odlguice
+    project-name: odlguice
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: odlguice-settings
+
+- project:
+    name: odlguice-sonar
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
+    project: 'odlguice'
+    project-name: 'odlguice'
+    branch: 'master'
+    mvn-settings: 'odlguice-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: odlguice-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlguice
+    project-name: odlguice
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: odlguice-view
     views: