Split out release-merge job to separate project

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

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index eea06da079c8808e0a91c5b48cc728c715e1dfca..25abe00ba32e8710f104efa9cf14be959ab01a34 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,8 +1,27 @@
 ---
+- project:
+    name: odlsaf-silicon
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: 'odlsaf'
+    project-name: 'odlsaf'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'odlsaf-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
+
+    # Used by the release job
+    staging-profile-id: 2802f0e38ee665
+
 - project:
     name: odlsaf-aluminium
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -11,7 +30,7 @@
     project-name: 'odlsaf'
     build-node: centos7-builder-2c-2g
     build-timeout: 120
-    branch: 'master'
+    branch: 'stable/aluminium'
     java-version: 'openjdk11'
     mvn-settings: 'odlsaf-settings'
     mvn-opts: '-Xmx2048m'
@@ -20,6 +39,35 @@
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
+- project:
+    name: odlsaf-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: odlsaf
+    project-name: odlsaf
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: odlsaf-settings
+
+- project:
+    name: odlsaf-sonar
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
+    project: 'odlsaf'
+    project-name: 'odlsaf'
+    branch: 'master'
+    mvn-settings: 'odlsaf-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: odlsaf-info
     jobs: