From a249bf6c5a9372f74bd3f44c5e98fe81d35579ea Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Tue, 26 Jun 2018 17:31:04 -0400 Subject: [PATCH] Move tempest to own job Change-Id: I99d2631ad9ad12a4dd43f8aaa08eb920a6cd8780 Signed-off-by: Sam Hague --- csit/configplans/netvirt-1node-openstack-tempest.txt | 1 + csit/configplans/netvirt-1node-tempest-openstack.txt | 2 -- csit/configplans/netvirt-3node-openstack-tempest.txt | 1 + csit/testplans/netvirt-1node-openstack-tempest.txt | 1 + csit/testplans/netvirt-1node-openstack.txt | 1 - csit/testplans/netvirt-1node-tempest-openstack.txt | 1 - csit/testplans/netvirt-3node-openstack-tempest.txt | 1 + csit/testplans/netvirt-3node-openstack.txt | 1 - 8 files changed, 4 insertions(+), 5 deletions(-) create mode 120000 csit/configplans/netvirt-1node-openstack-tempest.txt delete mode 100644 csit/configplans/netvirt-1node-tempest-openstack.txt create mode 120000 csit/configplans/netvirt-3node-openstack-tempest.txt create mode 100644 csit/testplans/netvirt-1node-openstack-tempest.txt delete mode 100644 csit/testplans/netvirt-1node-tempest-openstack.txt create mode 120000 csit/testplans/netvirt-3node-openstack-tempest.txt diff --git a/csit/configplans/netvirt-1node-openstack-tempest.txt b/csit/configplans/netvirt-1node-openstack-tempest.txt new file mode 120000 index 0000000000..409261532d --- /dev/null +++ b/csit/configplans/netvirt-1node-openstack-tempest.txt @@ -0,0 +1 @@ +netvirt-1node-openstack.txt \ No newline at end of file diff --git a/csit/configplans/netvirt-1node-tempest-openstack.txt b/csit/configplans/netvirt-1node-tempest-openstack.txt deleted file mode 100644 index 58ef5fd5ab..0000000000 --- a/csit/configplans/netvirt-1node-tempest-openstack.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Place the scripts in run order: -integration/test/csit/scripts/set_sg_mode.sh diff --git a/csit/configplans/netvirt-3node-openstack-tempest.txt b/csit/configplans/netvirt-3node-openstack-tempest.txt new file mode 120000 index 0000000000..c3f6b34cf5 --- /dev/null +++ b/csit/configplans/netvirt-3node-openstack-tempest.txt @@ -0,0 +1 @@ +netvirt-3node-openstack.txt \ No newline at end of file diff --git a/csit/testplans/netvirt-1node-openstack-tempest.txt b/csit/testplans/netvirt-1node-openstack-tempest.txt new file mode 100644 index 0000000000..e00eab2100 --- /dev/null +++ b/csit/testplans/netvirt-1node-openstack-tempest.txt @@ -0,0 +1 @@ +integration/test/csit/suites/openstack/tempest/tempest.robot \ No newline at end of file diff --git a/csit/testplans/netvirt-1node-openstack.txt b/csit/testplans/netvirt-1node-openstack.txt index 568012370a..664e13eb0c 100644 --- a/csit/testplans/netvirt-1node-openstack.txt +++ b/csit/testplans/netvirt-1node-openstack.txt @@ -3,7 +3,6 @@ integration/test/csit/suites/openstack/connectivity/l3.robot integration/test/csit/suites/openstack/connectivity/external_network.robot integration/test/csit/suites/openstack/connectivity/security_group.robot integration/test/csit/suites/openstack/connectivity/live_migration.robot -integration/test/csit/suites/openstack/tempest/tempest.robot integration/test/csit/suites/openstack/securitygroup/neutron_security_group.robot integration/test/csit/suites/netvirt/vpnservice/vpn_basic.robot integration/test/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot diff --git a/csit/testplans/netvirt-1node-tempest-openstack.txt b/csit/testplans/netvirt-1node-tempest-openstack.txt deleted file mode 100644 index 185f08c82f..0000000000 --- a/csit/testplans/netvirt-1node-tempest-openstack.txt +++ /dev/null @@ -1 +0,0 @@ -integration/test/csit/suites/openstack/tempest/ diff --git a/csit/testplans/netvirt-3node-openstack-tempest.txt b/csit/testplans/netvirt-3node-openstack-tempest.txt new file mode 120000 index 0000000000..00979d9b19 --- /dev/null +++ b/csit/testplans/netvirt-3node-openstack-tempest.txt @@ -0,0 +1 @@ +netvirt-1node-openstack-tempest.txt \ No newline at end of file diff --git a/csit/testplans/netvirt-3node-openstack.txt b/csit/testplans/netvirt-3node-openstack.txt index c69b95d34c..ba62b36eb2 100644 --- a/csit/testplans/netvirt-3node-openstack.txt +++ b/csit/testplans/netvirt-3node-openstack.txt @@ -7,7 +7,6 @@ integration/test/csit/suites/openstack/clustering/ha_l2.robot integration/test/csit/suites/openstack/clustering/ha_l3.robot # Disable this test until https://bugzilla.redhat.com/show_bug.cgi?id=1488907 gets resolved and then reflect changes in healthcheck in haproxy # integration/test/csit/suites/openstack/clustering/ha_l3_block_port.robot -integration/test/csit/suites/openstack/tempest/tempest.robot integration/test/csit/suites/netvirt/vpnservice/vpn_basic.robot integration/test/csit/suites/netvirt/elan/elan.robot integration/test/csit/suites/integration/Create_JVM_Plots.robot -- 2.36.6