X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=d3702638678593d58cd7f67abe59420326bac5c5;hb=bdb4a771825656c3f581c199c334465526008d45;hp=a594c374fd88ed92e2e4e8aa369c797a8f5ace9a;hpb=ec96b0c330245c65d2b8e67d403f19e546461882;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index a594c374f..d37026386 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -3,10 +3,13 @@
     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
+      - gerrit-tox-verify:
+          build-node: centos8-builder-2c-2g
+          parallel: true
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
@@ -37,7 +40,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
       - odl-maven-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+          build-node: centos8-builder-4c-4g
 
     project: "netconf"
     project-name: "netconf"
@@ -55,33 +58,6 @@
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-2.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-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
-
-    stream: 2.0.x
-    project: "netconf"
-    project-name: "netconf"
-    branch: "2.0.x"
-    java-version: "openjdk11"
-    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]"
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-release-management
     jobs:
@@ -110,11 +86,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}"