Feat: Add branch stable/phosphorus

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

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index 4ede6161d54f44a9dbdd1d849e8f763ba732d4da..fdc196aa615e44ab2674aed32d384b47e11c8ba7 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,21 +1,60 @@
 ---
+- project:
+    name: odlsaf-sulfur
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: sulfur
+    project: "odlsaf"
+    project-name: "odlsaf"
+    build-node: centos7-builder-4c-4g
+    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-phosphorus
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "odlsaf"
+    project-name: "odlsaf"
+    build-node: centos7-builder-4c-4g
+    build-timeout: 120
+    branch: "stable/phosphorus"
+    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-silicon
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: silicon
-    project: 'odlsaf'
-    project-name: 'odlsaf'
-    build-node: centos7-builder-2c-2g
+    project: "odlsaf"
+    project-name: "odlsaf"
+    build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlsaf-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "stable/silicon"
+    java-version: "openjdk11"
+    mvn-settings: "odlsaf-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"
 
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
@@ -27,19 +66,30 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
-    project: 'odlsaf'
-    project-name: 'odlsaf'
-    build-node: centos7-builder-2c-2g
+    project: "odlsaf"
+    project-name: "odlsaf"
+    build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlsaf-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "stable/aluminium"
+    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-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:
@@ -48,15 +98,15 @@
             -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'
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: odlsaf-info