Remove validate-ar jobs for non-nitrogen projects

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

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 3772421016812ec274ff1b4f578732b51dfb2e01..76dbdd619c62df68287d0c80c149e9a2f3238839 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -4,9 +4,9 @@
     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}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
@@ -44,6 +44,7 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -75,6 +76,7 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -92,38 +94,6 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
-- project:
-    name: vtn-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: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
 - project:
     name: vtn-sonar
     jobs: