X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fttp%2Fttp.yaml;h=250c982e52ec68e1975904c02f0cfe0212b9f079;hb=8031350e9d89387daf975d7fb360139473b3e900;hp=32c0a7307fda1db5dbf14ac3d948d3318dedd26b;hpb=88c96a7e1007879aaa22e824f3a8baf82a1794d7;p=releng%2Fbuilder.git

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 32c0a7307..250c982e5 100644
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: ttp-boron
+    name: ttp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -11,10 +10,8 @@
         - '{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:
-        - boron:
+        - carbon:
             disable_autorelease: False
             disable_distribution_check: False
     project: 'ttp'
@@ -25,16 +22,16 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-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: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: ttp-beryllium
+    name: ttp-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -44,29 +41,29 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
     stream:
-        - beryllium:
+        - boron:
             disable_autorelease: False
             disable_distribution_check: False
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    jdk: openjdk8
     jdks:
-        - openjdk7
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-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: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: ttp-lithium
+    name: ttp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -77,20 +74,21 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
     stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+        - beryllium:
+            disable_autorelease: False
+            disable_distribution_check: False
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
+        - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-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: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
@@ -104,5 +102,5 @@
     project-name: 'ttp'
     branch: 'master'
     mvn-settings: 'ttp-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'