Trim combinations

Change-Id: Id422fa5938202a372bfe304c47a9c004fcefb1b8
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 92477acd0ef18b6429f35edb286e7b9904fa72d8..5b0ee7f92a9c0526c50dbd2db5aaad3471d39e3d 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -4,20 +4,18 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'genius'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index b204cf6fb8dfe42bdf9fc72734a2553de8295a96..3dabe2ae77081e9ffffce97ae991579000f2b31c 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -9,13 +9,13 @@
     stream:
       - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c368819001c838084b782778a6e05d582519bf85..3db26552a4c790067db2eca3ff6daaa909f569be 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -43,12 +43,6 @@
           schedule: ''
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
@@ -107,12 +101,6 @@
           schedule: ''
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
@@ -167,12 +155,6 @@
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index a7a896beb0780db0193719cd35a7d1c1897ab863..73b3adb169d08726512b4bf6a1a4e8e9312fbee4 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -11,22 +11,13 @@
     stream:
       - fluorine:
           branch: 'master'
-          # ideally, master (oxygen) would gate against Queens (current master) or 'R' release
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          # ideally, master (oxygen) would gate against Queens (current master) or 'R' release
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          # ideally, master (oxygen) would gate against Queens (current master)
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index e52dc48d9f53ef3b367335d03176680040654def..01a735dccfbeeec4364b1192e0e3cda2d56e6889 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -11,13 +11,13 @@
     stream:
       - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 852e0a5b957f3dd4043bedf0912e1972eeb7c1e6..8495123cbd9d3d766336dfe1659b1a3bc257073a 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -10,17 +10,13 @@
     stream:
       - fluorine:
           branch: 'master'
-          # os-branch: 'pike'
-          # issues with pike right now (esp l2gw), lets stick with ocata
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          # os-branch: 'pike'
-          # issues with pike right now (esp l2gw), lets stick with ocata
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'