Fix deploy cookied-cicd-pike-dpdk
Change-Id: I658d733fed4a04f38473c295d6404fd781ccd6ae
diff --git a/tcp_tests/managers/execute_commands.py b/tcp_tests/managers/execute_commands.py
index e9b7d12..dda95d2 100644
--- a/tcp_tests/managers/execute_commands.py
+++ b/tcp_tests/managers/execute_commands.py
@@ -133,10 +133,10 @@
if x == 1 and skip_fail is False:
# In the last retry iteration, raise an exception
raise Exception("Step '{0}' failed:\n"
- "=======================================\n"
- "STDOUT: {1}\n"
- "=======================================\n"
- "STDERR: {2}\n"
+ "=============== STDOUT: ===============\n"
+ "{1}\n"
+ "=============== STDERR: ===============\n"
+ "{2}\n"
.format(description,
result.stdout_str,
result.stderr_str))
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
index 47fa2ea..ae2e235 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
@@ -18,15 +18,17 @@
retry: {count: 1, delay: 10}
skip_fail: false
-- description: "Workaround to avoid reboot cmp nodes: bring OVS interfaces UP (PROD-24343)"
+- description: "Workaround to avoid reboot cmp nodes: apply patch to bring OVS interfaces UP (PROD-24343)"
cmd: |
- salt 'cmp*' cmd.run "ifup br-prv";
- salt 'cmp*' cmd.run "ip l set up br-floating";
+ set -ex
+ git clone https://gerrit.mcp.mirantis.com/salt-formulas/linux /root/salt-formula-linux
+ cd /root/salt-formula-linux
+ git fetch https://gerrit.mcp.mirantis.com/salt-formulas/linux refs/changes/32/29432/11 && git checkout FETCH_HEAD
+ cp -r /root/salt-formula-linux/linux/ /srv/salt/env/prd/
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 10}
skip_fail: false
-
{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}