X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=0ce53e2cb610847c76623bf62197446c10c4e734;hb=4595ffaeb05ce118e78f29e6099cd6f327e71119;hp=dbd0b32b09a892977d72e456ffed1545f5c341a4;hpb=17c52894929c9c2251b5cd391f2d83595c37ed87;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index dbd0b32b0..0ce53e2cb 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -3,21 +3,25 @@
     name: netconf-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-tox-verify:
+          build-node: centos8-builder-2c-2g
+          parallel: true
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: master
     project: "netconf"
     project-name: "netconf"
+    stream: master
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
     dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
@@ -26,24 +30,28 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-1.13.x
+    name: netconf-4.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-tox-verify:
+          build-node: centos8-builder-2c-2g
+          parallel: true
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: 1.13.x
     project: "netconf"
     project-name: "netconf"
-    branch: "1.13.x"
-    java-version: "openjdk11"
+    stream: 4.0.x
+    branch: "4.0.x"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
     dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
@@ -52,9 +60,8 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-aluminium
+    name: netconf-3.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
@@ -62,32 +69,15 @@
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
-    stream: aluminium
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/aluminium"
+    stream: 3.0.x
+    branch: 3.0.x
     java-version: "openjdk11"
-    mvn-settings: "netconf-settings"
-    mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    build-timeout: 90
-    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
-- project:
-    name: netconf-1.7.4.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: 1.7.4.x
-    project: "netconf"
-    project-name: "netconf"
-    branch: "1.7.4.x"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -108,6 +98,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: netconf-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: netconf-sonar
@@ -123,10 +116,11 @@
     project: "netconf"
     project-name: "netconf"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"