X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpersistence%2Fpersistence.yaml;h=8d00a247da47406b5242d097fddb64cbbb5f158e;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=06ba70a8a7ab486253ff9c9dcc55e602d1f36d4c;hpb=dc3446222821ea43d71f9c355a1182c99d2a3c54;p=releng%2Fbuilder.git

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 06ba70a8a..8d00a247d 100644
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,91 +1,65 @@
 ---
 - project:
-    name: persistence-nitrogen
+    name: persistence-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     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}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     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}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     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'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'