Update sonar jobs to global-jjb

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index ef206e8df6746f6214d0161a179faeb253d830cf..13c60f745c51aa4cb6b3f63f3068c81bbb3b32de 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,17 +2,15 @@
 - project:
     name: alto-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: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-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: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-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: 'alto'
     project-name: 'alto'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,37 +78,13 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
-- project:
-    name: alto-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
 
 - project:
     name: alto-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'alto'
     project-name: 'alto'