X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=da8da068b937e397a337f8161d561bb3ec7c7e52;hb=8800579f6983befff06350107dcf30569fc3b003;hp=d96da0c6b3e4ba8508e6c7bf28f694c24dbb2b94;hpb=2560c7522b16c32b6057426d3b794452e0cccd1a;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index d96da0c6b..da8da068b 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,19 +1,18 @@
 ---
 - project:
-    name: bgpcep-nitrogen
+    name: bgpcep-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-2c-8g
+    build-timeout: 120
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -21,7 +20,7 @@
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -31,30 +30,31 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
-    name: bgpcep-carbon
+    name: bgpcep-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    build-node: centos7-builder-2c-8g
+    build-timeout: 120
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -64,22 +64,24 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
-    name: bgpcep-boron
+    name: bgpcep-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/boron'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 120
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -87,7 +89,7 @@
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -97,14 +99,17 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-2c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'