X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpersistence%2Fpersistence.yaml;h=55411c36c67be86b1a264f9fe7315b144ce983db;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=c84352ed9ec79406870c48a7727e68187f845d07;hpb=564ea6891db06cb85c10a008ea240056ce2610b0;p=releng%2Fbuilder.git

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index c84352ed9e..55411c36c6 100644
--- 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,46 +24,20 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
-- project:
-    name: persistence-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'persistence'
-    project-name: 'persistence'
-    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-boron
+    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: boron
+    stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/boron'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -79,18 +52,20 @@
     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}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
     jdks:
@@ -106,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'