X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn.yaml;h=69abc18b28be5b47a379f482e395d3cfee61e6a3;hb=7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb;hp=e3ba2c6c01493ad1224870974c3c9c1010ef55f6;hpb=88c1ee2b8aae1dd0cac4ee8476f481ba023a8141;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index e3ba2c6c0..69abc18b2 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -1,20 +1,16 @@
 ---
 - project:
-    name: vtn-nitrogen
+    name: vtn-oxygen
     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}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -31,22 +27,21 @@
     # 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-carbon
+    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-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
-    stream: carbon
+    stream: nitrogen
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -63,22 +58,22 @@
     # 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-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-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
-    stream: boron
+    stream: carbon
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -95,10 +90,13 @@
     # 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'