X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnic%2Fnic.yaml;h=f79f0cf591fef4d75ce5b4807088c10719791c4c;hb=ac68c247ed4b83393f82f2b5ea4e025b71942d40;hp=0571d5d77eb9f281b7fb5e9ece57ef1523c150ee;hpb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;p=releng%2Fbuilder.git

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 0571d5d77..f79f0cf59 100644
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,67 +1,56 @@
 ---
 - project:
-    name: nic-oxygen
+    name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    jdks:
-      - openjdk8
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
 
 - project:
-    name: nic-nitrogen
+    name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
 
 - project:
-    name: nic-carbon
+    name: nic-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
@@ -73,5 +62,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'