X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowjava%2Fopenflowjava.yaml;h=12c33b7bf16dd25595550ce35ebcc009fe1b3cb8;hb=735b5888b8d82eab624a6a0be41456834fded048;hp=6d5f8b47d740703333d5a7ec97a889dfae952d34;hpb=b6d93d72d8da4595f37dec333cfcc1584d2f0bad;p=releng%2Fbuilder.git

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 6d5f8b47d..12c33b7bf 100644
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: openflowjava-boron
+    name: openflowjava-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: False
             disable_distribution_check: False
     project: 'openflowjava'
@@ -27,14 +26,14 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowjava-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},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
 - project:
-    name: openflowjava-beryllium
+    name: openflowjava-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -44,30 +43,31 @@
         - '{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: False
             disable_distribution_check: False
-
     project: 'openflowjava'
     project-name: 'openflowjava'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    jdk: openjdk8
     jdks:
-        - openjdk7
         - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowjava-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},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
 - project:
-    name: openflowjava-lithium
+    name: openflowjava-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -78,12 +78,13 @@
         - '{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: 'openflowjava'
     project-name: 'openflowjava'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
@@ -92,7 +93,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowjava-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},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
@@ -106,5 +107,5 @@
     project-name: 'openflowjava'
     branch: 'master'
     mvn-settings: 'openflowjava-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'