X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fttp%2Fttp.yaml;h=c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=69e4c9a976128bd4be3d3f785b8c8187b9985348;hpb=e5ebb1faf1e71657113c709ef811a25242780862;p=releng%2Fbuilder.git

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 69e4c9a97..c555ea814 100644
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,25 +1,21 @@
+---
 - project:
-    name: ttp-carbon
+    name: ttp-oxygen
     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}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: carbon
+    stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -27,28 +23,26 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
-    name: ttp-boron
+    name: ttp-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}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: boron
+    stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -56,29 +50,27 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
-    name: ttp-beryllium
+    name: ttp-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}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: beryllium
+    stream: carbon
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -86,10 +78,13 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'