X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetconf%2Fnetconf.yaml;h=ab8f59214517f3ffac7453caaa2b4393d677cffb;hb=908afb0ba1eee10da370e4f6774b99513c66f0ce;hp=eac56d0ea5c25bc8a7363d0b67a9e942746db343;hpb=b094d327723da8b0c7d08f1698ef9fa086b7a3f9;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index eac56d0ea..ab8f59214 100644
--- 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
@@ -11,11 +10,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: master
     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"
@@ -28,9 +26,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
@@ -39,11 +36,10 @@
       - 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
+    branch: "1.13.x"
     java-version: "openjdk11"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
@@ -56,7 +52,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-magnesium
+    name: netconf-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -67,11 +63,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
+    branch: "stable/aluminium"
     java-version: "openjdk11"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
@@ -84,22 +79,15 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-sodium
+    name: netconf-1.7.4.x
     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
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: 1.7.4.x
     project: "netconf"
     project-name: "netconf"
-    branch: "stable/sodium"
-    build-node: centos7-builder-2c-8g
+    branch: "1.7.4.x"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -110,18 +98,34 @@
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
+- project:
+    name: netconf-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: netconf
+    project-name: netconf
+
+    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
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     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"