X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fttp%2Fttp.yaml;h=c81438262f07d5e6f99edbd1579451139354780a;hb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;hp=b7e3f8efc9b316fd8fc861563783bbe4455043d5;hpb=4570865812b545ce6880a6b4fd6960f32414652f;p=releng%2Fbuilder.git

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index b7e3f8efc..c81438262 100644
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,92 +1,77 @@
+---
 - project:
-    name: ttp-carbon
+    name: ttp-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}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - openjdk8
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     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-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - openjdk8
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     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-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - openjdk8
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     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'
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'