X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=67246a2fddd4d280e9ade05a0288b0393a008aaf;hb=f9339d2274fe3e2f8249bc2396c1f869435f9270;hp=e002bcf8d5375025b411a3e6e2cfcfa5c52d6301;hpb=67c1e0ed44ade0154d03b65ed7483d7f68731918;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index e002bcf8d..67246a2fd 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,80 +1,42 @@
 ---
 - project:
-    name: netconf-oxygen
+    name: netconf-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netconf-settings'
-    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
-
-- project:
-    name: netconf-carbon
+    name: netconf-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -86,6 +48,7 @@
     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'