Browse Source

Add v2 two-node scenario test

This patch adds a dual Octavia controller, two compute instance, scenario
gate job for both Python 3 and 2.

Depends-On: https://review.openstack.org/621677
Change-Id: Ibbe35aee947b7287eab42c292b8c8bf350e06806
Michael Johnson 7 months ago
parent
commit
9f99afdd90
2 changed files with 195 additions and 3 deletions
  1. 191
    3
      zuul.d/jobs.yaml
  2. 4
    0
      zuul.d/projects.yaml

+ 191
- 3
zuul.d/jobs.yaml View File

@@ -1,3 +1,36 @@
1
+- nodeset:
2
+    name: octavia-two-node
3
+    nodes:
4
+      - name: controller
5
+        label: ubuntu-xenial
6
+      - name: controller2
7
+        label: ubuntu-xenial
8
+    groups:
9
+      - name: controller
10
+        nodes:
11
+          - controller
12
+      # Node where tests are executed and test results collected
13
+      - name: tempest
14
+        nodes:
15
+          - controller
16
+      # Nodes running the compute service
17
+      - name: compute
18
+        nodes:
19
+          - controller
20
+          - controller2
21
+      # Nodes that are not the controller
22
+      - name: subnode
23
+        nodes:
24
+          - controller2
25
+      # Switch node for multinode networking setup
26
+      - name: switch
27
+        nodes:
28
+          - controller
29
+      # Peer nodes for multinode networking setup
30
+      - name: peers
31
+        nodes:
32
+          - controller2
33
+
1 34
 - job:
2 35
     name: octavia-dsvm-base
3 36
     parent: devstack-tempest
@@ -47,7 +80,7 @@
47 80
         s-proxy: false
48 81
         tempest: true
49 82
       devstack_plugins:
50
-        octavia: https://github.com/openstack/octavia.git
83
+        octavia: https://git.openstack.org/openstack/octavia.git
51 84
 
52 85
 - job:
53 86
     name: octavia-dsvm-live-base
@@ -64,11 +97,147 @@
64 97
         barbican: true
65 98
         neutron-qos: true
66 99
       devstack_plugins:
67
-        barbican: https://github.com/openstack/barbican.git
68
-        neutron: https://github.com/openstack/neutron.git
100
+        barbican: https://git.openstack.org/openstack/barbican.git
101
+        neutron: https://git.openstack.org/openstack/neutron.git
69 102
       zuul_copy_output:
70 103
         '/var/log/dib-build' : logs
71 104
 
105
+- job:
106
+    name: octavia-dsvm-live-two-node-base
107
+    parent: octavia-dsvm-base
108
+    nodeset: octavia-two-node
109
+    timeout: 9000
110
+    required-projects:
111
+      - openstack/barbican
112
+      - openstack/diskimage-builder
113
+      - openstack/python-barbicanclient
114
+    host-vars:
115
+      controller:
116
+        devstack_localrc:
117
+          # From devstack "vars:"
118
+          DATABASE_USER: octavia
119
+          DATABASE_PASSWORD: octavia_database_pw
120
+          RABBIT_PASSWORD: octavia_rabbit_pw
121
+          ADMIN_PASSWORD: octavia_admin_pw
122
+          SERVICE_PASSWORD: octavia_service_pw
123
+          NETWORK_GATEWAY: 10.1.0.1
124
+          FIXED_RANGE: 10.1.0.0/20
125
+          IPV4_ADDRS_SAFE_TO_USE: 10.1.0.0/20
126
+          FLOATING_RANGE: 172.24.5.0/24
127
+          PUBLIC_NETWORK_GATEWAY: 172.24.5.1
128
+          LOGFILE: /opt/stack/logs/devstacklog.txt
129
+          LOG_COLOR: false
130
+          VERBOSE: true
131
+          VERBOSE_NO_TIMESTAMP: true
132
+          NOVNC_FROM_PACKAGE: true
133
+          ERROR_ON_CLONE: true
134
+          MULTI_HOST: 1
135
+          SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
136
+          HOST_IP: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
137
+          TEMPEST_PLUGINS: "'/opt/stack/octavia-tempest-plugin'"
138
+          USE_PYTHON3: true
139
+          # Octavia specific settings
140
+          OCTAVIA_CONTROLLER_IP_PORT_LIST: 192.168.0.3:5555,192.168.0.4:5555
141
+          OCTAVIA_MGMT_PORT_IP: 192.168.0.3
142
+          OCTAVIA_NODE: main
143
+          OCTAVIA_NODES: "main:{{ hostvars['controller']['nodepool']['private_ipv4'] }},second:{{ hostvars['controller2']['nodepool']['private_ipv4'] }}"
144
+          OCTAVIA_USE_PREGENERATED_CERTS: true
145
+        devstack_plugins:
146
+          barbican: https://git.openstack.org/openstack/barbican.git
147
+          neutron: https://git.openstack.org/openstack/neutron.git
148
+          octavia: https://git.openstack.org/openstack/octavia.git
149
+      controller2:
150
+        devstack_localrc:
151
+          # From devstack "vars:"
152
+          DATABASE_USER: octavia
153
+          DATABASE_PASSWORD: octavia_database_pw
154
+          RABBIT_PASSWORD: octavia_rabbit_pw
155
+          ADMIN_PASSWORD: octavia_admin_pw
156
+          SERVICE_PASSWORD: octavia_service_pw
157
+          NETWORK_GATEWAY: 10.1.0.1
158
+          FIXED_RANGE: 10.1.0.0/20
159
+          IPV4_ADDRS_SAFE_TO_USE: 10.1.0.0/20
160
+          FLOATING_RANGE: 172.24.5.0/24
161
+          PUBLIC_NETWORK_GATEWAY: 172.24.5.1
162
+          LOGFILE: /opt/stack/logs/devstacklog.txt
163
+          LOG_COLOR: false
164
+          VERBOSE: true
165
+          VERBOSE_NO_TIMESTAMP: true
166
+          NOVNC_FROM_PACKAGE: true
167
+          ERROR_ON_CLONE: true
168
+          MULTI_HOST: 1
169
+          HOST_IP: "{{ hostvars['controller2']['nodepool']['private_ipv4'] }}"
170
+          SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
171
+          NEUTRON_SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
172
+          DATABASE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
173
+          RABBIT_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
174
+          GLANCE_HOSTPORT: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}:9292"
175
+          USE_PYTHON3: true
176
+          # Octavia specific settings
177
+          OCTAVIA_CONTROLLER_IP_PORT_LIST: 192.168.0.3:5555,192.168.0.4:5555
178
+          OCTAVIA_NODE: subnode
179
+          OCTAVIA_USE_PREGENERATED_CERTS: true
180
+          OCTAVIA_MGMT_PORT_IP: 192.168.0.4
181
+        devstack_plugins:
182
+          octavia: https://git.openstack.org/openstack/octavia.git
183
+    group-vars:
184
+      controller:
185
+        devstack_local_conf:
186
+          post-config:
187
+            $OCTAVIA_CONF:
188
+              DEFAULT:
189
+                debug: True
190
+              api_settings:
191
+                api_v1_enabled: False
192
+        devstack_services:
193
+          base: false
194
+          barbican: true
195
+          dstat: true
196
+          g-api: true
197
+          g-reg: true
198
+          key: true
199
+          mysql: true
200
+          n-api: true
201
+          n-api-meta: true
202
+          n-cauth: true
203
+          n-cond: true
204
+          n-cpu: true
205
+          n-obj: true
206
+          n-sch: true
207
+          neutron-qos: true
208
+          octavia: true
209
+          o-api-ha: true
210
+          o-api: true
211
+          o-cw: true
212
+          o-hm: true
213
+          o-hk: true
214
+          peakmem_tracker: true
215
+          placement-api: true
216
+          q-agt: true
217
+          q-dhcp: true
218
+          q-l3: true
219
+          q-meta: true
220
+          q-svc: true
221
+          rabbit: true
222
+          tempest: true
223
+          tls-proxy: true
224
+      subnode:
225
+        devstack_local_conf:
226
+          post-config:
227
+            $OCTAVIA_CONF:
228
+              DEFAULT:
229
+                debug: True
230
+              api_settings:
231
+                api_v1_enabled: False
232
+        devstack_services:
233
+          c-vol: false
234
+          c-bak: false
235
+          octavia: true
236
+          o-api: true
237
+          o-cw: true
238
+          o-hm: true
239
+          o-hk: true
240
+
72 241
 - job:
73 242
     name: octavia-dsvm-noop-base
74 243
     parent: octavia-dsvm-base
@@ -151,6 +320,25 @@
151 320
     parent: octavia-v2-dsvm-py2-scenario
152 321
     override-checkout: stable/queens
153 322
 
323
+- job:
324
+    name: octavia-v2-dsvm-scenario-two-node
325
+    parent: octavia-dsvm-live-two-node-base
326
+    vars:
327
+      tempest_concurrency: 2
328
+      tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2
329
+      tox_envlist: all
330
+
331
+- job:
332
+    name: octavia-v2-dsvm-py2-scenario-two-node
333
+    parent: octavia-v2-dsvm-scenario-two-node
334
+    host-vars:
335
+      controller:
336
+        devstack_localrc:
337
+          USE_PYTHON3: False
338
+      controller2:
339
+        devstack_localrc:
340
+          USE_PYTHON3: False
341
+
154 342
 - job:
155 343
     name: octavia-v2-dsvm-py2-scenario-centos-7
156 344
     parent: octavia-v2-dsvm-py2-scenario

+ 4
- 0
zuul.d/projects.yaml View File

@@ -19,6 +19,10 @@
19 19
             voting: false
20 20
         - octavia-v2-dsvm-scenario-ubuntu-bionic:
21 21
             voting: false
22
+        - octavia-v2-dsvm-scenario-two-node:
23
+            voting: false
24
+        - octavia-v2-dsvm-py2-scenario-two-node:
25
+            voting: false
22 26
     gate:
23 27
       queue: octavia
24 28
       jobs:

Loading…
Cancel
Save