diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-18 20:46:05 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-22 14:58:02 +0000 |
| commit | 544fa286cf4397941ca8627117479d7f4c6d9f28 (patch) | |
| tree | bd23cad6163637b1c063d3fc9a74b45368d92bc5 /mcp/patches | |
| parent | 9b5bffe65199af34cb089c7a782e5e4234610768 (diff) | |
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 </root/opnfv>, and <root/fuel>
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 77942178b3aff6adc83b5f83645acfff467fa76a)
Diffstat (limited to 'mcp/patches')
| -rwxr-xr-x | mcp/patches/patch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh index ca5c14111..1da3bc597 100755 --- a/mcp/patches/patch.sh +++ b/mcp/patches/patch.sh @@ -14,7 +14,7 @@ if [ -r "$1" ]; then if [[ ! "${p_dest}" =~ '^#' ]] && [[ "${p_dest}" =~ $2 ]] && \ ! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \ "/root/fuel/mcp/patches/${p_file}" > /dev/null; then - patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}" + patch -d "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}" fi done < "$1" fi |