X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn.yaml;h=76dbdd619c62df68287d0c80c149e9a2f3238839;hb=7daa1faff620b4b796cf0e318079b2f0b617c422;hp=3eb33be388eff469afa2474c227fcf078a5a8773;hpb=5bae7cd8254aff34e1e3772769b6268ec913b5d6;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 3eb33be38..76dbdd619 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -1,145 +1,103 @@
+---
 - project:
-    name: vtn-carbon
+    name: vtn-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: nitrogen
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - 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]'
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2 manager/northbound/target/site/wsdocs/** manager/api/target/*-javadoc.jar manager/api/target/apidocs/** target/*-javadoc.jar target/apidocs/** manager/model/target/site/models/**'
+
+    # 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-boron
+    name: vtn-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{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:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - 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]'
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2 manager/northbound/target/site/wsdocs/** manager/api/target/*-javadoc.jar manager/api/target/apidocs/** target/*-javadoc.jar target/apidocs/** manager/model/target/site/models/**'
 
-- project:
-    name: vtn-beryllium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
-    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]'
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2 manager/northbound/target/site/wsdocs/** manager/api/target/*-javadoc.jar manager/api/target/apidocs/** target/*-javadoc.jar target/apidocs/** manager/model/target/site/models/**'
+    # 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-lithium
+    name: vtn-boron
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{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:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+    stream: boron
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/lithium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-        - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - 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]'
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2 manager/northbound/target/site/wsdocs/** manager/api/target/*-javadoc.jar manager/api/target/apidocs/** target/*-javadoc.jar target/apidocs/** manager/model/target/site/models/**'
+
+    # 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:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'