X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvtn%2Fvtn.yaml;h=d5a7386eb03c0eedb44cedfb7ddefa0e6c64dae9;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=a564d0457ca69050ce2d5645827479ed7a12896a;hpb=866315a15e48aa263e85bebefd549dd0bbd1328e;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index a564d0457..d5a7386eb 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -1,26 +1,17 @@
 ---
 - project:
-    name: vtn-nitrogen
+    name: vtn-oxygen
     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}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -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]'
@@ -30,62 +21,22 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
-- project:
-    name: vtn-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - 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'
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
 
 - project:
-    name: vtn-boron
+    name: vtn-nitrogen
     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}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -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]'
@@ -95,30 +46,23 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
-    name: vtn-beryllium
+    name: vtn-carbon
     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}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    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-goals: 'clean deploy -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]'
@@ -128,13 +72,16 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'