Merge "Update SFC netvirt CSIT with fluorine and queens"

[releng/builder.git] / jjb / nic / nic.yaml

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index e6b160b06e3f9a06bab220fef2432787cb5fcfc2..0502ea4a623c4c2ce943c5d9035c977f591eba43 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,21 +1,37 @@
 ---
+- project:
+    name: nic-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    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-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'nic'
     project-name: 'nic'
-    branch: 'master'
+    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
@@ -24,7 +40,6 @@
     name: nic-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -36,7 +51,6 @@
     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
@@ -45,7 +59,6 @@
     name: nic-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -58,7 +71,6 @@
     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