Remove lithium jobs

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 9d60bc029656127ead8e689fdd55a10b14a0e985..531ee28e84136f78a0a827734507bdcfa1372797 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: persistence-boron
+    name: persistence-carbon
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -14,7 +13,7 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
+        - carbon:
             disable_autorelease: True
             disable_distribution_check: False
     project: 'persistence'
@@ -28,14 +27,14 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
 - project:
-    name: persistence-beryllium
+    name: persistence-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -45,13 +44,16 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             disable_autorelease: True
             disable_distribution_check: False
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
     jdk: openjdk7
     jdks:
         - openjdk7
@@ -60,14 +62,14 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
 - project:
-    name: persistence-lithium
+    name: persistence-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -78,12 +80,12 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
     stream:
-        - stable-lithium:
+        - beryllium:
             disable_autorelease: True
-            disable_distribution_check: True
+            disable_distribution_check: False
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
@@ -92,7 +94,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
@@ -106,5 +108,5 @@
     project-name: 'persistence'
     branch: 'master'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'