X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=f84cd92562386fc0598159018284dfa9ee2154d6;hb=b73daf53fc7841c391169353dd5489a36be6e79e;hp=0c18d9da18bb6c95ff669510df6eabbc19dfc9bb;hpb=11c551436bc92392100a6cb2e01855f469269202;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 0c18d9da1..f84cd9256 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -14,8 +14,8 @@
     project: "netconf"
     project-name: "netconf"
     branch: "master"
-    build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -27,9 +27,8 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-aluminium
+    name: netconf-1.13.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
@@ -38,40 +37,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 1.13.x
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    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-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{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: magnesium
-    project: "netconf"
-    project-name: "netconf"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
+    branch: "1.13.x"
     java-version: "openjdk11"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -85,14 +56,14 @@
 - project:
     name: netconf-1.7.4.x
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - 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"
@@ -113,6 +84,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
@@ -128,7 +102,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"