X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdocs%2Fdocs.yaml;h=7a24b7cdbdbec39ff48fa3df52df0399fae86427;hb=e37e75ec6759746119c04393671b757f027772f0;hp=2cbbbb3e2e36f1a205e8f45a2e1b65c91b4a60b9;hpb=575ca0fbad0b0fe0a57fa212c4605de95c8a13fe;p=releng%2Fbuilder.git

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 2cbbbb3e2..7a24b7cdb 100644
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: docs-boron
+    name: docs-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: True
     project: 'docs'
@@ -27,14 +24,14 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'docs-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: '[docs] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: docs-beryllium
+    name: docs-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: True
     project: 'docs'
     project-name: 'docs'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    jdk: openjdk8
     jdks:
-        - openjdk7
         - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'docs-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: '[docs] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: docs-lithium
+    name: docs-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
+        - beryllium:
+            disable_autorelease: False
             disable_distribution_check: True
     project: 'docs'
     project-name: 'docs'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
+        - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'docs-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: '[docs] [odlparent]'
@@ -104,5 +102,5 @@
     project-name: 'docs'
     branch: 'master'
     mvn-settings: 'docs-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'