Merge "Remove Ubuntu 16.04 packer build jobs"

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

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index a31d0858c844cecb4f042744456f9a6ca996925e..62cafe18a52862d985149dd817aacc862b4eb467 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: bgpcep-silicon
+    name: bgpcep-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -12,7 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "bgpcep"
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
@@ -32,7 +32,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-aluminium
+    name: bgpcep-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -44,12 +44,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "bgpcep"
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"
@@ -64,7 +64,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-magnesium
+    name: bgpcep-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -76,12 +76,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: "bgpcep"
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"
@@ -96,7 +96,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-sodium
+    name: bgpcep-magnesium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -105,15 +105,16 @@
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: "bgpcep"
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/sodium"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"
     dependencies: >
@@ -126,14 +127,27 @@
     # Used by the release job
     staging-profile-id: 9427a05049030
 
+- project:
+    name: bgpcep-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: bgpcep
+    project-name: bgpcep
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: bgpcep-settings
+
 - project:
     name: bgpcep-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -P!karaf
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "bgpcep"
     project-name: "bgpcep"