Update sonar jobs to global-jjb

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d6276a03d0637c6e8984b3f3533dd19a2baaaa6a..6c743bc372bf2059ca6ad66fa5f78ee3717dfe53 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,18 +1,17 @@
 ---
 - project:
-    name: infrautils-nitrogen
+    name: infrautils-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,21 +24,21 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
-    name: infrautils-carbon
+    name: infrautils-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: carbon
+    stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -52,21 +51,22 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
-    name: infrautils-boron
+    name: infrautils-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: boron
+    stream: carbon
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -79,10 +79,13 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'