aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-05 07:04:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-05 07:04:09 +0000
commitf201c865ce86b192d18536e4266c7cd574304987 (patch)
treec54d7c74f450e30a3dfd42b1e0780911bdfe6875
parent3a76d07dbd409b781abdb8520f55a1b20edf07db (diff)
parentc523b7632d6c3f669fab1eeb235ebd63d1df907a (diff)
Merge "salt.sh: Execute deepclean before importing patches"
-rwxr-xr-xmcp/scripts/salt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 70b5757a8..4fa54ab1c 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -17,7 +17,7 @@ OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
OPNFV_FUEL_DIR="/root/fuel"
# patch reclass-system-salt-model locally before copying it over
-make -C "${F_GIT_ROOT}/mcp/patches" patches-import
+make -C "${F_GIT_ROOT}/mcp/patches" deepclean patches-import
# push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel
# later we move it to ~root/fuel and delete the temporary clone