Browse Source

Adjust test groups in the tests and fix typo

- Use murano_plugin_upgrade test group for upgrade tests
- Use 5 slaves for ha bvt test case with murano on controllers

Change-Id: If8aef10f6687e26eaa9f435d33aa29cdefbaca3b
Victor Ryzhenkin 2 years ago
parent
commit
344a800c3e

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

@@ -77,7 +77,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
77 77
         Snapshot deploy_murano_plugin_on_controller_ha
78 78
         """
79 79
 
80
-        self.env.revert_snapshot("ready_with_3_slaves")
80
+        self.env.revert_snapshot("ready_with_5_slaves")
81 81
 
82 82
         self.prepare_plugin()
83 83
 
@@ -164,7 +164,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
164 164
 
165 165
     @test(depends_on_groups=['prepare_slaves_9'],
166 166
           groups=["deploy_murano_plugin_full_ha", "deploy",
167
-                  "murano", "bvt"])
167
+                  "murano", "bvt", "deploy_murano_bvt"])
168 168
     @log_snapshot_after_test
169 169
     def deploy_murano_plugin_full_ha(self):
170 170
         """Deploy a cluster with the Murano plugin in full HA mode.
@@ -199,7 +199,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
199 199
 
200 200
     @test(depends_on=[deploy_murano_plugin],
201 201
           groups=["uninstall_deployed_murano_plugin", "uninstall",
202
-                  "murano_plugin", "smoke", 'murano'])
202
+                  "murano_plugin", "smoke", 'murano', "deploy_murano_bvt"])
203 203
     @log_snapshot_after_test
204 204
     def uninstall_deployed_murano_plugin(self):
205 205
         """Uninstall the Murano plugin with a deployed environment
@@ -223,7 +223,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
223 223
 
224 224
     @test(depends_on_groups=["prepare_slaves_3"],
225 225
           groups=["uninstall_murano_plugin", "uninstall", "murano_plugin",
226
-                  "smoke", 'murano'])
226
+                  "smoke", 'murano', "deploy_murano_bvt"])
227 227
     @log_snapshot_after_test
228 228
     def uninstall_murano_plugin(self):
229 229
         """Uninstall the Murano plugin

+ 39
- 29
murano_plugin_tests/murano_plugin/test_murano_plugin_update.py View File

@@ -24,25 +24,19 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi):
24 24
     """Class for testing upgrades for Murano plugin."""
25 25
 
26 26
     @test(depends_on_groups=["prepare_slaves_3"],
27
-          groups=["deploy_murano_and_plugin", "upgrade",
28
-                  "murano"])
27
+          groups=["deploy_murano_out_of_the_box", "murano"])
29 28
     @log_snapshot_after_test
30
-    def deploy_murano_plugin_in_environment_with_murano(self):
31
-        """Upgrade Murano via plugin and run OSTF tests.
29
+    def deploy_murano_out_of_the_box(self):
30
+        """Deploy Murano out of the box and run OSTF tests
32 31
 
33 32
         Scenario:
34 33
             1. Deploy Fuel Cluster with one controller and Murano
35 34
             2. Run OSTF
36
-            3. Upload plugin to master node
37
-            4. Install plugin
38
-            5. Activate plugin
39
-            6. Update cluster (Deploy changes)
40
-            7. Run OSTF
35
+            3. Make snapshot
41 36
 
42 37
         Duration 90m
43
-        Snapshot deploy_murano_plugin_in_environment_with_murano
38
+        Snapshot deploy_murano_out_of_the_box
44 39
         """
45
-
46 40
         self.env.revert_snapshot("ready_with_3_slaves")
47 41
 
48 42
         self.helpers.create_cluster(name=self.__class__.__name__,
@@ -52,6 +46,29 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi):
52 46
 
53 47
         self.helpers.run_ostf(['sanity', 'smoke', 'tests_platform'])
54 48
 
49
+        self.env.make_snapshot("deploy_murano_out_of_the_box", is_make=True)
50
+
51
+    @test(depends_on=[deploy_murano_out_of_the_box],
52
+          groups=["deploy_murano_and_plugin", "murano_plugin_upgrade",
53
+                  "murano",
54
+                  "deploy_murano_plugin_in_environment_with_murano"])
55
+    @log_snapshot_after_test
56
+    def deploy_murano_plugin_in_environment_with_murano(self):
57
+        """Upgrade Murano via plugin and run OSTF tests.
58
+
59
+        Scenario:
60
+            1. Revert shapshot with box murano installation
61
+            2. Upload plugin to master node
62
+            3. Install plugin
63
+            4. Activate plugin
64
+            5. Update cluster (Deploy changes)
65
+            6. Run OSTF
66
+
67
+        Duration 60m
68
+        Snapshot deploy_murano_plugin_in_environment_with_murano
69
+        """
70
+        self.env.revert_snapshot("deploy_murano_out_of_the_box")
71
+
55 72
         self.prepare_plugin()
56 73
 
57 74
         self.activate_plugin()
@@ -64,35 +81,28 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi):
64 81
             "deploy_murano_plugin_in_environment_with_murano",
65 82
             is_make=False)
66 83
 
67
-    @test(depends_on_groups=["prepare_slaves_3"],
84
+    @test(depends_on=[deploy_murano_out_of_the_box],
68 85
           groups=["deploy_murano_and_plugin_add_role", "deploy",
69
-                  "murano"])
86
+                  "murano", "murano_plugin_upgrade",
87
+                  "deploy_murano_plugin_in_environment_with_murano"])
70 88
     @log_snapshot_after_test
71 89
     def deploy_murano_node_in_environment_with_murano(self):
72 90
         """Upgrade Murano via plugin (adding murano-node) and run OSTF tests.
73 91
 
74 92
         Scenario:
75
-            1. Deploy Fuel Cluster with one controller and Murano
76
-            2. Run OSTF
77
-            3. Upload plugin to master node
78
-            4. Install plugin
79
-            5. Activate plugin and add new node
93
+            1. Revert shapshot with box murano installation
94
+            2. Upload plugin to master node
95
+            3. Install plugin
96
+            4. Activate plugin and add new node
80 97
                with murano-node role to the cluster
81
-            6. Update cluster (Deploy changes)
82
-            7. Run OSTF
98
+            5. Update cluster (Deploy changes)
99
+            6. Run OSTF
83 100
 
84
-        Duration 120m
101
+        Duration 75m
85 102
         Snapshot deploy_murano_node_in_environment_with_murano
86 103
         """
87 104
 
88
-        self.env.revert_snapshot("ready_with_3_slaves")
89
-
90
-        self.helpers.create_cluster(name=self.__class__.__name__,
91
-                                    settings={'murano': True})
92
-
93
-        self.helpers.deploy_cluster(self.only_controllers)
94
-
95
-        self.helpers.run_ostf(['sanity', 'smoke', 'tests_platform'])
105
+        self.env.revert_snapshot("deploy_murano_out_of_the_box")
96 106
 
97 107
         self.prepare_plugin()
98 108
 

Loading…
Cancel
Save