Merge "Remove duplicated parts from Ansible-ODL CI script"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 2ec08126c828c3c31371eaec53bc891188037102..389154284727f5cf02d1edf8a214c31ed68db28c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -251,6 +251,14 @@
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 
+    openstack:
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_queens}'
+          openstack_system2_image: '{openstack_system_image_queens}'
+
     stream:
       - neon:
           branch: 'master'
@@ -263,14 +271,8 @@
           ovs-install: 'v2.6.1-nsh'
           os-cmp-cnt: 1
           openstack_system2_count: 1
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration

diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index c63614ba5ae9d1a82d5363971dc3bb255bbc3ca0..6d879573e6eda69b08c930f36e85de5c04793a89 100644 (file)
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -33,6 +33,18 @@
       - robot-list
     recurse: false
 
+- view:
+    name: '00-Empty View'
+    description: >
+      Empty job view. This is used as the default landing view to keep the
+      Jenkins UI responding better while a) under high load and b) when there
+      are a lot of jobs defined in the system'
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    recurse: false
+    regex: ''
+
 - view:
     name: 01-Recent
     regex: '.*'