Add mri-stage job

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 83ef5a143073cf9a6cc80fcdf3f8618ffb5a7b68..40eab4505338837c29fe363fd073bf2ce815b1cf 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: aaa-silicon
+    name: aaa-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -11,7 +10,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: master
     project: "aaa"
     project-name: "aaa"
     branch: "master"
@@ -25,9 +24,8 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-aluminium
+    name: aaa-0.13.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -36,10 +34,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 0.13.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/aluminium"
+    branch: 0.13.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -50,7 +48,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-magnesium
+    name: aaa-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -61,10 +59,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -74,13 +72,30 @@
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
+- project:
+    name: aaa-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: aaa
+    project-name: aaa
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: aaa-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 60
+
 - project:
     name: aaa-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "aaa"
     project-name: "aaa"