Use maven-3.8 for autorelease jobs

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

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 10034699c5dd13851ef05e60143bc73891e33cdb..86015e521e34a41233d14dd2fb5a57498297d296 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: netconf-silicon
+    name: netconf-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
@@ -10,14 +9,16 @@
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: master
     project: "netconf"
     project-name: "netconf"
     branch: "master"
-    build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
+    build-node: centos8-builder-4c-4g
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
@@ -28,9 +29,8 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-aluminium
+    name: netconf-2.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
@@ -39,12 +39,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 2.0.x
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
+    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"
@@ -56,9 +56,8 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-magnesium
+    name: netconf-1.13.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
@@ -67,33 +66,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: 1.13.x
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
+    branch: "1.13.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"
-    build-node: centos7-builder-2c-8g
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -114,6 +92,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
@@ -129,7 +110,6 @@
     project: "netconf"
     project-name: "netconf"
     branch: "master"
-    build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"