Merge "corrections to netvirt jobs naming following rename"

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 3860cab571f1488e71e57a706dec059d8aafc87e..c9117fc1caabc33459fb675fa528f62c1f68b728 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -18,7 +18,7 @@
     feature:
         - netvirt:
             csit-list: >
-                netvirt-csit-1node-openstack-mitaka-transparent-{stream}
+                netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}
 
         - genius:
             csit-list: >

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d3543774466e31bfa8aef64d51c09720057e30c1..b4126cbe7b6e7016bb6e8cc780f8916541e422c4 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -84,11 +84,11 @@
                 lispflowmapping-csit-1node-msmr-all-{stream},
                 nemo-csit-1node-engine-all-{stream},
                 nemo-csit-1node-engine-only-{stream},
-                netvirt-csit-1node-openstack-basic-only-{stream},
-                netvirt-csit-1node-openstack-basic-all-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-csit-3node-clustering-only-{stream},
+                netvirt-csit-1node-openstack-mitaka-upstream-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-only-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-all-{stream},
+                netvirt-legacy-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-legacy-csit-3node-clustering-only-{stream},
                 ocpplugin-csit-1node-get-only-{stream},
                 ocpplugin-csit-1node-get-all-{stream},
                 ocpplugin-csit-1node-scalability-only-{stream},

diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
similarity index 100%
rename from jjb/netvirt/netvirt-csit-clustering.yaml
rename to jjb/netvirt/netvirt-legacy-csit-clustering.yaml

diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
similarity index 100%
rename from jjb/netvirt/netvirt-csit.yaml
rename to jjb/netvirt/netvirt-legacy-csit.yaml

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index dda793a5c25176bbfc5cda185e78bb274398da42..ebf9552f5d2cfdde80796888207caf9deba1edea 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -26,8 +26,8 @@
                 netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}
         - legacy-cluster:
             csit-list: >
+                netvirt-legacy-csit-3node-openstack-mitaka-gate-{stream}
                 netvirt-legacy-csit-3node-clustering-only-{stream},
-                netvirt-legacy-csit-3node-openstack-mitaka-openstack-{stream}
         - current-cluster:
             csit-list: >
-                netvirt-csit-3node-openstack-newton-openstack-{stream}
\ No newline at end of file
+                netvirt-csit-3node-openstack-newton-gate-{stream}