Merge "Add OVSDB TLS connection tests in AAA project"

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index dbb2dddbcb7273924ff42117b2bc86d9cf9b5ee7..d1d416c00fe63684cdf5b457d94ce7744e412a25 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -40,6 +40,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +68,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,34 +82,6 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: controller-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: 'controller'
-    project-name: 'controller'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: controller-sonar
     jobs: