Merge "Migrate tsdr to global-jjb Maven jobs"

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 9ccf6eb5eab48ec5513fdf82552376636be8abbd..011b887da66d512a673a9562914030dac3c02512 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,11 +2,10 @@
 - project:
     name: tsdr-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: 'tsdr'
@@ -24,14 +23,16 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-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: 'tsdr'
@@ -49,14 +50,16 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-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: 'tsdr'
@@ -75,6 +78,9 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-sonar
     jobs: