Merge "ci/deploy.sh, lib.sh: Align SSH_KEY with Jenkins"
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Tue, 5 Sep 2017 07:40:46 +0000 (07:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 5 Sep 2017 07:40:46 +0000 (07:40 +0000)
mcp/scripts/salt.sh

index 70b5757..4fa54ab 100755 (executable)
@@ -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