Fix ocata BVT tests
- Use removing of not used cfg* nodes before generating cluster
nodes
- Add @pytest.mark.fail_snapshot to mcp11_ocata tests
- Remove outdated salt_cmd definitions from tests
Change-Id: I797efb6bb6a5e451e8fbfe8b38c48a6a761838b6
Reviewed-on: https://review.gerrithub.io/370644
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
index 476bd80..dbd87a5 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
@@ -161,9 +161,22 @@
retry: {count: 1, delay: 1}
skip_fail: false
-- description: Restart salt-master service
+- description: "*Workaround* remove all cfg01 nodes except {{ HOSTNAME_CFG01 }} to not depend on other clusters in 'reclass --top'"
cmd: |
- systemctl restart salt-master;
+ # Remove all other nodes except {{ HOSTNAME_CFG01 }} to not rely on them for 'reclass --top'
+ find /srv/salt/reclass/nodes/ -type f -not -name {{ HOSTNAME_CFG01 }}.yml -delete
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: Show reclass-salt --top for cfg01 node
+ cmd: reclass-salt --top
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: Restart salt-master service
+ cmd: systemctl restart salt-master;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
@@ -243,10 +256,7 @@
skip_fail: false
- description: Show reclass-salt --top
- cmd: |
- # Remove all other nodes except {{ HOSTNAME_CFG01 }} to not rely on them for 'reclass --top'
- find /srv/salt/reclass/nodes/ -type f -not -name {{ HOSTNAME_CFG01 }}.yml -delete
- reclass-salt --top
+ cmd: reclass-salt --top
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false