From 77942178b3aff6adc83b5f83645acfff467fa76a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 18 Nov 2017 20:46:05 +0100 Subject: ci/deploy.sh: Add new `-E` arg for env erase NOTE: In order to undefine VCP VMs with NVRAM (e.g. AArch64 VMs using AAVMF), an additional parameter should be passed to libvirt by Salt virt core module (equivalent to `virsh undefine --nvram`). While at it, pass CI_DEBUG, ERASE_ENV enviroment variables to state execution, and stop force-applying patches. Also refactor the rsync between foundation node and Salt master, so the whole git repo is copied as , and becomes a link to it; useful for Armband, where 'fuel' is a git submodule. Fix .git paths after rsync, so git submodules work as expected in cfg01 repos. JIRA: FUEL-307 Change-Id: Ic62f03e786581c019168c50ccc50107238021d7f Signed-off-by: Alexandru Avadanii --- .gitignore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c8064d486..4e90f3248 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,14 @@ .cache* .project .pydevproject -ci/config/ -deploy/autodeploy.log +**/ci/config/ +**/deploy/autodeploy.log *~ .*.sw? -/docs_build/ -/docs_output/ -/releng/ -mcp/deploy/images/ -mcp/scripts/mcp.rsa* -mcp/scripts/user-data.sh -mcp/scripts/net_mcpcontrol.xml +**/docs_build/ +**/docs_output/ +**/releng/ +**/mcp/deploy/images/ +**/mcp/scripts/mcp.rsa* +**/mcp/scripts/user-data.sh +**/mcp/scripts/net_mcpcontrol.xml -- cgit 1.2.3-korg