Browse Source

Reduce amount of slaves in devops template

Change-Id: I80b7caad030ca844fb3f2514849f12fac02fec6c
ibumarskov 2 years ago
parent
commit
68a8022e36
2 changed files with 5 additions and 29 deletions
  1. 3
    27
      plugin_test/test_templates/default.yaml
  2. 2
    2
      plugin_test/tests/test_plugin_nsxt.py

+ 3
- 27
plugin_test/test_templates/default.yaml View File

@@ -44,20 +44,14 @@ template:
44 44
            - storage
45 45
 
46 46
       rack-01-slave-node-params: &rack-01-slave-node-params
47
-        vcpu: !os_env SLAVE_NODE_CPU, 4
47
+        vcpu: !os_env SLAVE_NODE_CPU, 2
48 48
         memory: !os_env SLAVE_NODE_MEMORY, 8192
49 49
         boot:
50 50
           - network
51 51
           - hd
52 52
         volumes:
53 53
          - name: system
54
-           capacity: !os_env NODE_VOLUME_SIZE, 55
55
-           format: qcow2
56
-         - name: cinder
57
-           capacity: !os_env NODE_VOLUME_SIZE, 55
58
-           format: qcow2
59
-         - name: swift
60
-           capacity: !os_env NODE_VOLUME_SIZE, 55
54
+           capacity: !os_env NODE_VOLUME_SIZE, 150
61 55
            format: qcow2
62 56
         interfaces: *rack-01-slave-interfaces
63 57
         network_config: *rack-01-slave-network_config
@@ -70,13 +64,7 @@ template:
70 64
           - hd
71 65
         volumes:
72 66
          - name: system
73
-           capacity: !os_env NODE_VOLUME_SIZE, 55
74
-           format: qcow2
75
-         - name: cinder
76
-           capacity: !os_env NODE_VOLUME_SIZE, 55
77
-           format: qcow2
78
-         - name: swift
79
-           capacity: !os_env NODE_VOLUME_SIZE, 55
67
+           capacity: !os_env NODE_VOLUME_SIZE, 150
80 68
            format: qcow2
81 69
         interfaces: *rack-01-slave-interfaces
82 70
         network_config: *rack-01-slave-network_config
@@ -195,15 +183,3 @@ template:
195 183
         - name: slave-05
196 184
           role: fuel_slave
197 185
           params: *rack-02-slave-node-params
198
-        - name: slave-06
199
-          role: fuel_slave
200
-          params: *rack-02-slave-node-params
201
-        - name: slave-07
202
-          role: fuel_slave
203
-          params: *rack-02-slave-node-params
204
-        - name: slave-08
205
-          role: fuel_slave
206
-          params: *rack-02-slave-node-params
207
-        - name: slave-09
208
-          role: fuel_slave
209
-          params: *rack-02-slave-node-params

+ 2
- 2
plugin_test/tests/test_plugin_nsxt.py View File

@@ -145,7 +145,7 @@ class TestNSXtSmoke(TestNSXtBase):
145 145
 class TestNSXtBVT(TestNSXtBase):
146 146
     """NSX-t BVT scenarios"""
147 147
 
148
-    @test(depends_on=[SetupEnvironment.prepare_slaves_9],
148
+    @test(depends_on=[SetupEnvironment.prepare_slaves_5],
149 149
           groups=["nsxt_bvt"])
150 150
     @log_snapshot_after_test
151 151
     def nsxt_bvt(self):
@@ -168,7 +168,7 @@ class TestNSXtBVT(TestNSXtBase):
168 168
         Duration 3 hours
169 169
 
170 170
         """
171
-        self.env.revert_snapshot("ready_with_9_slaves")
171
+        self.env.revert_snapshot("ready_with_5_slaves")
172 172
 
173 173
         self.show_step(1)
174 174
         self.install_nsxt_plugin()

Loading…
Cancel
Save