From c523b7632d6c3f669fab1eeb235ebd63d1df907a Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Mon, 4 Sep 2017 12:43:36 -0400 Subject: salt.sh: Execute deepclean before importing patches Deepcleaning can be useful when deploying from an existing local repo Change-Id: I3908d6533c744da7cc863a250f4158c6c0e8e169 Signed-off-by: Junaid Ali --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index b291b0f7c..8a7545db8 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 -- cgit 1.2.3-korg