X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=bc4f4e1eac4d99ebfb131108e58e178217d70084;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=c242f5343c1fc8ba5bf694f82b71c6b3877f9a9a;hpb=810bc47e9b36cf01c8184078fcfe870fdd97a4ef;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index c242f5343..bc4f4e1ea 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,25 +1,19 @@
 ---
 - project:
-    name: bgpcep-oxygen
+    name: bgpcep-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
     branch: 'master'
-    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},
@@ -27,66 +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}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean install'
-    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-carbon
+    name: bgpcep-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'stable/oxygen'
     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,7 +47,6 @@
         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
@@ -102,12 +54,11 @@
 - 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'