X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=5c8ee1da206d3a5a111f85a64f7abbe6c868d4fe;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=8e5b708c003c373aa07b771d1a0e765024770d2d;hpb=4aaa45a1cafdf3191f28a3885a7010fa966a6bda;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 8e5b708c0..5c8ee1da2 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,26 +2,18 @@
 - project:
     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: oxygen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          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},
@@ -29,31 +21,25 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
 
 - project:
     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: nitrogen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
     branch: 'stable/nitrogen'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          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},
@@ -61,32 +47,26 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
 
 - project:
     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: carbon
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    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-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -94,50 +74,18 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
-- project:
-    name: bgpcep-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'bgpcep-settings'
-    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: ''
+    # 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-8c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'