X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=3525b5ae7f1dac73ba2aad95fc783edc12236ad4;hb=4404ad7255a3343ddfb331831e6fc7bd972a9362;hp=81bbf70478ea96a3474996dd1835986dae1de66c;hpb=b54b4233f7a1709fa5b0ab7a0cb256f2cb1c822a;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 81bbf7047..3525b5ae7 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,104 +1,118 @@
 ---
 - 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
+          java-version: openjdk17
       - "{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.19.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+          java-version: openjdk17
       - "{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.19.x
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
+    branch: "0.19.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-0.18.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+          java-version: openjdk17
       - "{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: magnesium
+    stream: 0.18.x
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/magnesium"
-    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-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: bgpcep
+    project-name: bgpcep
+
+    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
+
 - project:
     name: bgpcep-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk17:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -P!karaf
@@ -108,16 +122,11 @@
 
     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-settings: "bgpcep-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}"
 
 - project:
     name: bgpcep-info