X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetconf%2Fnetconf.yaml;h=75ba7e4c08fac2d8fa85c74030785b4e0caf6898;hb=8ad961fad6d4a35e7447e62ebf98191795ac82dc;hp=4e0115749366c777febaa9983b4cfb4b3a262da8;hpb=e8a56411730412990a7ad3ef97bcee5643d981a9;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 4e0115749..75ba7e4c0 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,34 +83,6 @@
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: netconf-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: netconf-sonar
     jobs: