Merge "Update CentOS7 docker images"

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

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 1aacfab228f072ef9e5ac6a07e9a3f268cccd40f..77b1bb7943410971b381101b045f87e22fbba41f 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.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
@@ -40,6 +39,7 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +67,7 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,34 +81,6 @@
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
-- project:
-    name: messaging4transport-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: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
-
 - project:
     name: messaging4transport-sonar
     jobs: