Re-try for glusterfs.server.setup
Change-Id: If67470aabe9a2248008b94846360b6b9a9278699
Related-Bug:#PROD-15526
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/common-services.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/common-services.yaml
index cf66773..7c247b7 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/common-services.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/common-services.yaml
@@ -42,7 +42,7 @@
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
+ retry: {count: 2, delay: 5}
skip_fail: false
- description: Check the gluster status
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/oss.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/oss.yaml
index 87f6dd8..e2ee183 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/oss.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/oss.yaml
@@ -226,7 +226,7 @@
- description: "Setup Jenkins"
cmd: salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@jenkins:client' state.sls jenkins
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 3, delay: 10}
+ retry: {count: 10, delay: 30}
skip_fail: false
# Postgres && Pushkin
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
index c7a708d..4c5b470 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
@@ -145,11 +145,14 @@
# Change environment configuration before deploy
- description: Set SL docker images deploy parameters
cmd: |
+ touch /srv/salt/reclass/classes/cluster/overrides.yml;
{% for sl_opt, value in config.sl_deploy.items() %}
{% if value|string() %}
salt-call reclass.cluster_meta_set {{ sl_opt }} {{ value }};
{% endif %}
{% endfor %}
+ salt '*' saltutil.refresh_pillar;
+ sleep 10
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 1}
skip_fail: false