Browse Source

Add a feature support matrix test for grenade subnode

test-features.sh wasn't testing anything for subnodes
so this adds a subnode feature support matrix test for
grenade. It also highlights that the grenade config
is applied to all nodes regardless of role so a TODO
is added to test_matrix.py in case someone needs to make
that per-role, per-config service override support at
some point (hopefully that never really happens and all
jobs are moved to zuulv3 by that point).

Change-Id: I485d76c1db5c3a4363c3e26fea204cc7782887f3
changes/41/700241/1
Matt Riedemann 1 year ago
parent
commit
183a58eab1
2 changed files with 11 additions and 0 deletions
  1. +2
    -0
      roles/test-matrix/library/test_matrix.py
  2. +9
    -0
      test-features.sh

+ 2
- 0
roles/test-matrix/library/test_matrix.py View File

@ -100,6 +100,8 @@ def calc_services(branch, features, configs, role):
grid_feature[branch].get('rm-services', []))
# Finally, calculate any services to add/remove per config.
# TODO(mriedem): This is not role-based so any per-config service
# modifications are dealt with globally across all nodes.
# do all the adds first
for config in configs:
if config in GRID['config']:


+ 9
- 0
test-features.sh View File

@ -24,6 +24,8 @@ TEMPEST_HEAT_SLOW_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-re
GRENADE_NEW_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,tempest,placement-api"
GRENADE_SUBNODE_MASTER="n-api-meta,n-cpu,g-api,c-vol,dstat,peakmem_tracker,placement-client"
# Utility function for tests
function assert_list_equal {
local source
@ -72,11 +74,18 @@ function test_grenade_new_master {
assert_list_equal $GRENADE_NEW_MASTER $results
}
function test_grenade_subnode_master {
local results
results=$(DEVSTACK_GATE_GRENADE=pullup DEVSTACK_GATE_TEMPEST=1 ./roles/test-matrix/library/test_matrix.py -n -r subnode)
assert_list_equal $GRENADE_SUBNODE_MASTER $results
}
test_full_master
test_full_feature_ec
test_neutron_master
test_heat_slow_master
test_grenade_new_master
test_grenade_subnode_master
if [[ "$ERRORS" -ne 0 ]]; then
echo "Errors detected, job failed"


Loading…
Cancel
Save