Feat!: Remove all stable/aluminium jobs

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

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index 2aa4b0e5501ba8233569527cb6425ca8a0b7e5f2..ec132bdced2bec4702e031c2c6cac04ec51a4d7c 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: odlmicro-silicon
+    name: odlmicro-sulfur
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: sulfur
     project: odlmicro
     project-name: "odlmicro"
     branch: "master"
@@ -19,15 +19,34 @@
     staging-profile-id: 44ce67428fd0d
 
 - project:
-    name: odlmicro-aluminium
+    name: odlmicro-phosphorus
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: phosphorus
     project: odlmicro
     project-name: "odlmicro"
-    branch: "stable/aluminium"
+    branch: "stable/phosphorus"
+    java-version: "openjdk11"
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    mvn-settings: "odlmicro-settings"
+    mvn-opts: "-Xmx2048m"
+
+    # Used by the release job
+    staging-profile-id: 44ce67428fd0d
+
+- project:
+    name: odlmicro-silicon
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: odlmicro
+    project-name: "odlmicro"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     build-node: centos7-builder-2c-2g
     build-timeout: 60
@@ -51,14 +70,12 @@
 - project:
     name: odlmicro-sonar
     jobs:
-      - gerrit-maven-sonar:
-          mvn-params: >
-            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+      - gerrit-maven-sonar
 
     project: "odlmicro"
     project-name: "odlmicro"
     branch: "master"
+    java-version: "openjdk11"
     mvn-settings: "odlmicro-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true