Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

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

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 10e12ff2e0a62c998c3f30149613167d6e4be4c5..e53712d932f9d646d844ffff372823711a9b7aee 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,20 +1,37 @@
 ---
+- project:
+    name: unimgr-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -24,7 +41,6 @@
     name: unimgr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -35,7 +51,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -45,7 +60,6 @@
     name: unimgr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -57,7 +71,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job