X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnmp4sdn%2Fsnmp4sdn.yaml;h=2a0ff6b0bf26af7096062c6ce4b76c536d5b8824;hb=d27789f385d9b0a8364cd76aca59fbd989f53690;hp=c70c3a90ff29bdd8293ff3d27a3f34d66cf39b88;hpb=e8a56411730412990a7ad3ef97bcee5643d981a9;p=releng%2Fbuilder.git

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index c70c3a90f..2a0ff6b0b 100644
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -6,7 +6,6 @@
       - '{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: nitrogen
@@ -33,13 +32,13 @@
       - '{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: carbon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -60,13 +59,13 @@
       - '{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: boron
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,34 +79,6 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: snmp4sdn-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: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: snmp4sdn-sonar
     jobs: