X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=7bd3ae1d5801dd204b62673d410cb89f1ae48ef4;hb=f5a29ef027b19b09b4736ddfbccfcffc96188ab3;hp=881dd944eafd389c6f6c2ba3a2aacf7ff2c5452f;hpb=3b7337e10982705f4d597979e00b0a821179e444;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 881dd944e..7bd3ae1d5 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: bgpcep-boron
+    name: bgpcep-carbon
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,12 +8,12 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{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
 
@@ -22,19 +22,20 @@
     build-node: centos7-java-builder-4c-8g
     branch: 'master'
     jdk: openjdk8
+    jdks:
+        - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
-
 - project:
-    name: bgpcep-beryllium
+    name: bgpcep-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -43,34 +44,35 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{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: 'bgpcep'
     project-name: 'bgpcep'
-    branch: 'stable/beryllium'
-    jdk:
-        - openjdk7
+    build-node: centos7-java-builder-4c-8g
+    branch: 'stable/boron'
+    jdk: openjdk8
+    jdks:
         - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
+
 
 - project:
-    name: bgpcep-lithium
+    name: bgpcep-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -79,31 +81,32 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+        - beryllium:
+            disable_autorelease: False
+            disable_distribution_check: False
 
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/lithium'
-    jdk:
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
         - openjdk7
         - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
+    build-node: centos7-java-builder-4c-8g
 
 - project:
     name: bgpcep-sonar
@@ -115,5 +118,5 @@
     build-node: centos7-java-builder-4c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'