X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=5e5054050696ab99aca8ba30262b54208c2915d8;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=197c84126a41f28fcba52a9ceab5e79baf8e4a00;hpb=27cee20f365aa2862417a15f29b1ff000d3e4b1f;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 197c84126..5e5054050 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,27 +1,42 @@
 ---
+- project:
+    name: netconf-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -30,25 +45,18 @@
     name: netconf-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -57,26 +65,19 @@
     name: netconf-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -84,10 +85,11 @@
 - project:
     name: netconf-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'