Update sonar jobs to global-jjb

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 503ab86153c09686988126fc07a5c2e2a882bee1..55411c36c67be86b1a264f9fe7315b144ce983db 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,23 +1,22 @@
+---
 - project:
-    name: persistence-carbon
+    name: persistence-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: carbon
+    stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
     jdk: openjdk7
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -25,26 +24,27 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
-    name: persistence-boron
+    name: persistence-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: boron
+    stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -52,26 +52,28 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
-    name: persistence-beryllium
+    name: persistence-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: beryllium
+    stream: carbon
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -79,10 +81,13 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'