X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=67246a2fddd4d280e9ade05a0288b0393a008aaf;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=876e7de509fde54e94b9669a35f0c2572a5161b9;hpb=9d926f94fe3824189d4990b904c1807602ba7d85;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 876e7de50..67246a2fd 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,12 +1,11 @@
 ---
 - 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'
@@ -22,42 +21,20 @@
     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'
-    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'
-    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-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'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     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]'