Update sonar jobs to global-jjb

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

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 572547004d92b4e46a3f4ca939552584e43ecda3..aa3c6139d6ec1e6ff4733e3566014c08a87d180d 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,11 +2,10 @@
 - project:
     name: atrium-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: 'atrium'
@@ -24,14 +23,16 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-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: 'atrium'
@@ -49,14 +50,16 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-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: 'atrium'
@@ -75,10 +78,13 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'