X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnic%2Fnic.yaml;h=8bf2afef336f56828e2b6a716fa88125e5ff5b6f;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=5d0dd476fc3e7f83bfc162b39927302c4615b65b;hpb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;p=releng%2Fbuilder.git

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 5d0dd476f..8bf2afef3 100644
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: nic-oxygen
+    name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
@@ -19,36 +18,16 @@
     staging-profile-id: a67ef386204aa
 
 - project:
-    name: nic-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
-- project:
-    name: nic-carbon
+    name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/carbon'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'