salt.sh: Execute deepclean before importing patches 13/41013/2
authorJunaid Ali <junaidali.yahya@gmail.com>
Mon, 4 Sep 2017 16:43:36 +0000 (12:43 -0400)
committerJunaid Ali <junaidali.yahya@gmail.com>
Mon, 4 Sep 2017 17:05:01 +0000 (13:05 -0400)
Deepcleaning can be useful when deploying from an existing local repo

Change-Id: I3908d6533c744da7cc863a250f4158c6c0e8e169
Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
mcp/scripts/salt.sh

index b291b0f..8a7545d 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