X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=e4f7cab67065116e5854fa7e7753d2e5f89fab98;hb=6c099dfd81640689dec35b6bcad121be7304133d;hp=1d58e13e55332a3284f4c044678c2943648912be;hpb=db77ad16837e5362d05614916d21b1a6d58c5381;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 1d58e13e5..e4f7cab67 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,12 +10,12 @@
       - 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"
+    karaf-version: "netconf"
     mvn-settings: "netconf-settings"
     mvn-goals: "clean deploy -Pintegrationtests"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -28,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
@@ -39,12 +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
+    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"
@@ -56,7 +54,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-magnesium
+    name: netconf-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -67,12 +65,33 @@
       - 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"
+    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-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"
@@ -83,6 +102,20 @@
     # 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:
@@ -97,7 +130,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"