X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flispflowmapping%2Flispflowmapping.yaml;h=582621eeca1d1209d84b9b5fa1673bbfbab1fe71;hb=fec89881ec40dd1f7d74bfc77e129784daf4ccde;hp=e4cbd7d62397bc04e33cc7dde5be38033569297e;hpb=127a3833e66cb7daae10a98078b2ee75303191aa;p=releng%2Fbuilder.git

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index e4cbd7d623..582621eeca 100644
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,18 +1,16 @@
 ---
 - project:
-    name: lispflowmapping-nitrogen
+    name: lispflowmapping-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: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -23,24 +21,27 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-carbon
+    name: lispflowmapping-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: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -51,24 +52,28 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-boron
+    name: lispflowmapping-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: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -80,12 +85,15 @@
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
 
 - project:
     name: lispflowmapping-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'