From 644dc6a6cd8c4a309352a2b2602d757f4acbf63b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 14 Oct 2017 22:47:45 +0200 Subject: states: Break on error, retry states up to 5 times While applying scenario states, break on error, and retry failed state up to 5 times. Apply the same behavior for `salt.sh`. Add new deploy parameter, '-D', backed up by 'CI_DEBUG' env var, which gates deploy sh scripts logging (set -x). Also extend '-f' deploy parameter, allowing it to be specified more than once; the first occurence will skip infra VM creation, but still sync reclass & other config from local repo, while a second occurence will also disable config sync. To prevent glusterfs client state from failing due to non-existent nova user/group, move it after nova:compute's nova state is applied. Change-Id: I234e126e16be0e133d878957bd88fed946955de8 Signed-off-by: Alexandru Avadanii (cherry picked from commit 23f9ef727310a8ef449372313785241df6557559) --- mcp/patches/patch.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mcp/patches') diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh index 6c6d646b3..ca5c14111 100755 --- a/mcp/patches/patch.sh +++ b/mcp/patches/patch.sh @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e ############################################################################## # Copyright (c) 2017 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials @@ -7,10 +7,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x + if [ -r "$1" ]; then while IFS=': ' read -r p_dest p_file; do - if [[ "${p_dest}" =~ $2 ]]; then - patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}" + 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}" fi done < "$1" fi -- cgit 1.2.3-korg