Update sonar jobs to global-jjb

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

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index f6aa2617fd5545496ee5c42a9db0cabbf8240c14..cdcdb8427de535e3343c95b081844169b2fd48d7 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,17 +1,15 @@
 ---
 - project:
-    name: yangide-nitrogen
+    name: yangide-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,19 +22,20 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
-    name: yangide-carbon
+    name: yangide-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/carbon'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -49,19 +48,21 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
-    name: yangide-boron
+    name: yangide-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
       - openjdk8
     maven:
@@ -74,10 +75,13 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangide'
     project-name: 'yangide'