X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=71371c2ad500f6580e8322ec179a277ebc4dedb8;hb=1309a144c140e56537d53ae0332535b9a640de60;hp=a31d0858c844cecb4f042744456f9a6ca996925e;hpb=b094d327723da8b0c7d08f1698ef9fa086b7a3f9;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index a31d0858c..71371c2ad 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,130 +1,79 @@
 ---
 - project:
-    name: bgpcep-silicon
+    name: bgpcep-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-tox-verify:
+          parallel: true
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: master
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-8c-8g
     mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
       controller-merge-{stream},
       mdsal-merge-{stream}
     email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
     # Used by the release job
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-aluminium
+    name: bgpcep-0.18.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-tox-verify:
+          parallel: true
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: aluminium
+    stream: 0.18.x
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
+    branch: "0.18.x"
+    build-node: centos8-builder-8c-8g
     mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
       controller-merge-{stream},
       mdsal-merge-{stream}
     email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
     # Used by the release job
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-magnesium
+    name: bgpcep-release-management
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: bgpcep
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
-          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: magnesium
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      mdsal-merge-{stream}
-    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
-- project:
-    name: bgpcep-sodium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: bgpcep
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
-          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+    project: bgpcep
+    project-name: bgpcep
 
-    stream: sodium
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
+    build-node: centos7-builder-2c-1g
+    mvn-settings: bgpcep-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: 120
-    branch: "stable/sodium"
-    mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      mdsal-merge-{stream}
-    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
 
 - project:
     name: bgpcep-sonar
@@ -132,15 +81,17 @@
       - 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"
-    build-node: centos7-builder-8c-8g
+    build-node: centos8-builder-8c-8g
     build-timeout: 120
     branch: "master"
-    java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true