Browse Source

Do not execute ha tests on non-ha environments

Change-Id: I58d164bd10993c2f1e4fd5149bda7c39c3661ffb
Victor Ryzhenkin 2 years ago
parent
commit
a6b4b9ed37

+ 2
- 3
murano_plugin_tests/murano_plugin/api.py View File

@@ -77,9 +77,8 @@ class MuranoPluginApi(object):
77 77
         """Upload and install the plugin on the Fuel master node."""
78 78
         self.helpers.prepare_plugin(self.settings.plugin_path)
79 79
 
80
-    def run_ostf(self):
81
-        self.helpers.run_ostf(test_sets=['sanity', 'smoke', 'ha',
82
-                                         'tests_platform'])
80
+    def run_ostf(self, test_sets):
81
+        self.helpers.run_ostf(test_sets=test_sets)
83 82
 
84 83
     def activate_plugin(self, options=None):
85 84
         """Enable and configure the plugin in the environment."""

+ 1
- 1
murano_plugin_tests/murano_plugin/test_failover.py View File

@@ -29,7 +29,7 @@ class TestMuranoFailover(api.MuranoPluginApi):
29 29
 
30 30
         self.check_plugin_failover(operation, role_name)
31 31
 
32
-        self.run_ostf()
32
+        self.run_ostf(['sanity', 'smoke', 'tests_platform'])
33 33
 
34 34
     @test(depends_on_groups=["deploy_murano_plugin"],
35 35
           groups=["failover", "murano", "system", "destructive",

+ 5
- 5
murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py View File

@@ -54,7 +54,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
54 54
 
55 55
         self.helpers.deploy_cluster(self.base_nodes)
56 56
 
57
-        self.run_ostf()
57
+        self.run_ostf(['sanity', 'smoke', 'tests_platform'])
58 58
 
59 59
         self.env.make_snapshot("deploy_murano_plugin", is_make=True)
60 60
 
@@ -90,7 +90,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
90 90
 
91 91
         self.helpers.deploy_cluster(self.ha_nodes)
92 92
 
93
-        self.run_ostf()
93
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
94 94
 
95 95
         self.env.make_snapshot("deploy_murano_plugin_ha", is_make=True)
96 96
 
@@ -126,13 +126,13 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
126 126
 
127 127
         self.helpers.deploy_cluster(self.full_ha_nodes)
128 128
 
129
-        self.run_ostf()
129
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
130 130
 
131 131
         self.env.make_snapshot("deploy_murano_plugin_full_ha", is_make=True)
132 132
 
133 133
     @test(depends_on=[deploy_murano_plugin],
134 134
           groups=["uninstall_deployed_murano_plugin", "uninstall",
135
-                  "murano_plugin", "smoke"])
135
+                  "murano_plugin", "smoke", 'murano'])
136 136
     @log_snapshot_after_test
137 137
     def uninstall_deployed_murano_plugin(self):
138 138
         """Uninstall the Murano plugin with a deployed environment
@@ -155,7 +155,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
155 155
 
156 156
     @test(depends_on_groups=["prepare_slaves_3"],
157 157
           groups=["uninstall_murano_plugin", "uninstall", "murano_plugin",
158
-                  "smoke"])
158
+                  "smoke", 'murano'])
159 159
     @log_snapshot_after_test
160 160
     def uninstall_murano_plugin(self):
161 161
         """Uninstall the Murano plugin

+ 4
- 4
murano_plugin_tests/murano_plugin/test_post_install.py View File

@@ -27,7 +27,7 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
27 27
 
28 28
     @test(depends_on_groups=["prepare_slaves_3"],
29 29
           groups=["deploy_environment_without_murano_plugin", "deploy",
30
-                  "murano_plugin", "post_installation"])
30
+                  "murano_plugin", "post_installation", 'murano'])
31 31
     @log_snapshot_after_test
32 32
     def deploy_environment_without_murano_plugin(self):
33 33
         """Deploy a cluster without the Murano Detach plugin.
@@ -60,14 +60,14 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
60 60
             'slave-02': ['compute', 'cinder'],
61 61
         })
62 62
 
63
-        self.helpers.run_ostf()
63
+        self.run_ostf(['sanity', 'smoke', 'tests_platform'])
64 64
 
65 65
         self.env.make_snapshot("deploy_environment_without_murano_plugin",
66 66
                                is_make=True)
67 67
 
68 68
     @test(depends_on=[deploy_environment_without_murano_plugin],
69 69
           groups=["deploy_murano_plugin_in_existing_environment", "deploy",
70
-                  "murano_plugin", "post_installation"])
70
+                  "murano_plugin", "post_installation", 'murano'])
71 71
     @log_snapshot_after_test
72 72
     def deploy_murano_plugin_in_existing_environment(self):
73 73
         """Deploy the Murano Detach plugin in an existing environment.
@@ -92,4 +92,4 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
92 92
 
93 93
         self.check_plugin_online()
94 94
 
95
-        self.run_ostf()
95
+        self.run_ostf(['sanity', 'smoke', 'tests_platform'])

+ 6
- 6
murano_plugin_tests/murano_plugin/test_system.py View File

@@ -59,7 +59,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
59 59
 
60 60
         self.check_plugin_online()
61 61
 
62
-        self.run_ostf()
62
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
63 63
 
64 64
         compute_manipulated_node = {'slave-04': ['compute', 'cinder']}
65 65
 
@@ -68,7 +68,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
68 68
 
69 69
         self.check_plugin_online()
70 70
 
71
-        self.run_ostf()
71
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
72 72
 
73 73
         # Add controller
74 74
         # NOTE(rpromyshlennikov): test can fail here before
@@ -78,14 +78,14 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
78 78
 
79 79
         self.check_plugin_online()
80 80
 
81
-        self.run_ostf()
81
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
82 82
 
83 83
         # Add compute
84 84
         self.helpers.add_nodes_to_cluster(compute_manipulated_node)
85 85
 
86 86
         self.check_plugin_online()
87 87
 
88
-        self.run_ostf()
88
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
89 89
 
90 90
     @test(depends_on_groups=["deploy_murano_plugin_full_ha"],
91 91
           groups=["check_scaling_murano", "scaling",
@@ -117,11 +117,11 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
117 117
 
118 118
         self.check_plugin_online()
119 119
 
120
-        self.run_ostf()
120
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
121 121
 
122 122
         # Add Murano Detach node
123 123
         self.helpers.add_nodes_to_cluster(manipulated_node)
124 124
 
125 125
         self.check_plugin_online()
126 126
 
127
-        self.run_ostf()
127
+        self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])

Loading…
Cancel
Save