Merge "Update validate autorelease projects for nitrogen"

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 666c4a37d4d6b6868433360b70539f5cbbcf7766..a8dc7eb20e5272b416de930ce49cadac68f05aa5 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -24,11 +24,11 @@
     feature:
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}
 
       - genius:
           csit-list: >

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 9ee840aacf290d2ff5682b44b3f228a11ef096c8..c13369f0b7ef8ccf09914696b9becb6240c00912 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -60,7 +60,7 @@ pip install --upgrade jsonpatch
 # Module networking-l2gw is required for using l2gw commands with neutron client
 # Module python-neutronclient is needed for certain tests run with Openstack Newton
 #  that does not work with Openstack Client
-pip install python-openstackclient
+pip install python-openstackclient==3.11.0
 pip install networking-l2gw
 pip install python-neutronclient==6.1.0
 

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index d6ad65ca94fa93002fef998910d1fe18cc7c4585..3400ee73d66348832195280075e2a36db251471b 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -24,38 +24,34 @@
     feature:
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
       - minimal-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-minimal-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-minimal-stateful-{stream}
       - tempest-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-tempest-stateful-{stream}
-      - cluster-legacy:
-          csit-list: >
-              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-3node-clustering-only-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-tempest-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}
       - nodl-v1-current:
           csit-list: >
               netvirt-csit-1node-openstack-newton-gate-stateful-{stream}
       - learn-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-learn-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-learn-{stream}
       - stateful-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
       - transparent-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-transparent-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-transparent-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-{stream}
       - hwvtep:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-newton-gate-stateful-{stream}
+              netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}
 
 - project:
     name: netvirt-legacy-patch-test
@@ -77,3 +73,7 @@
           csit-list: >
               netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
               netvirt-legacy-csit-1node-openstack-basic-only-{stream}
+      - cluster-legacy:
+          csit-list: >
+              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
+              netvirt-legacy-csit-3node-clustering-only-{stream}

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 3dcfffb4059e962697b56dcc426334bb4a375104..f18598e874f9ac650fbd78e85d504f61fa52ed27 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -35,8 +35,8 @@
 
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index b5b92f83fdc02ec0b0a2012d5e3578af671c76ee..a0534c36aa6dde04156793d9778b87c299ee18ae 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -26,7 +26,7 @@
               genius-csit-1node-genius-only-{stream}
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
 
       - core:
           csit-list: >