Update sonar jobs to global-jjb

[releng/builder.git] / jjb / ttp / ttp.yaml

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index c5c0a8981f243d7d31c1302fc3db426fea329a34..c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -2,17 +2,15 @@
 - project:
     name: ttp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,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'