Update validate autorelease projects for carbon

[releng/builder.git] / jjb / openflowplugin / openflowplugin.yaml

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 8c6c18025594bbe7746d32685ce15966a6bcbcc3..2762c3d4331f4772c9517f0ec7342ed9be331a31 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.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
@@ -37,13 +36,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: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -75,6 +74,7 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -92,38 +92,6 @@
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
-- project:
-    name: openflowplugin-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: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
-
 - project:
     name: openflowplugin-sonar
     jobs: