X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fttp%2Fttp.yaml;h=8d4fbdf700d0e3e2f763bd313854a04d164e311f;hb=df8d25fdd2b4750f5bf6bf65d71539d72647f210;hp=8a9f7379427147d520efe62e77e98f1a8b0dc631;hpb=5f162c063dd0b10ba1b504234900205d965148a4;p=releng%2Fbuilder.git

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 8a9f73794..8d4fbdf70 100644
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,94 +1,63 @@
 ---
 - project:
-    name: ttp-nitrogen
+    name: ttp-fluorine
     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}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     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-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}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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'