Merge "Migrate vtn to global-jjb Maven jobs"

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 06ba70a8a7ab486253ff9c9dcc55e602d1f36d4c..6342cc935b363e9503ae6e10a3f0b458a5fbf673 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,13 +1,12 @@
 ---
 - project:
-    name: persistence-nitrogen
+    name: persistence-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: 'persistence'
     project-name: 'persistence'
     branch: 'master'
@@ -25,19 +24,20 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
-    name: persistence-carbon
+    name: persistence-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: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -52,18 +52,20 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
-    name: persistence-boron
+    name: persistence-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: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
     jdks:
@@ -79,6 +81,9 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-sonar
     jobs: