Gate: Bash array fixups and improvements
Change-Id: I4dd722f9d115c395f60b2c4a5ced739527ae4f96
This commit is contained in:
parent
52d1839dd4
commit
9a5d70f30a
@ -7,7 +7,7 @@ registry_down() {
|
||||
}
|
||||
|
||||
registry_list_images() {
|
||||
FILES=$(find "$(config_configuration)" -type f -name '*.yaml')
|
||||
FILES=($(find "$(config_configuration)" -type f -name '*.yaml'))
|
||||
|
||||
HOSTNAME_REGEX='[a-zA-Z0-9][a-zA-Z0-9_-]{0,62}'
|
||||
DOMAIN_NAME_REGEX="${HOSTNAME_REGEX}(\.${HOSTNAME_REGEX})*"
|
||||
@ -41,9 +41,9 @@ registry_populate() {
|
||||
}
|
||||
|
||||
registry_replace_references() {
|
||||
FILES="${*}"
|
||||
for image in $(registry_list_images "${FILES}"); do
|
||||
sed -i "s;${image};registry:5000/${image};g" "${FILES}"
|
||||
FILES=(${@})
|
||||
for image in $(registry_list_images); do
|
||||
sed -i "s;${image};registry:5000/${image};g" "${FILES[@]}"
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,7 @@ rsync_cmd() {
|
||||
}
|
||||
|
||||
ssh_cmd() {
|
||||
if [[ ${GATE_DEBUG} = "1" ]]; then
|
||||
if [[ -v GATE_DEBUG && ${GATE_DEBUG} = "1" ]]; then
|
||||
ssh -F "${SSH_CONFIG_DIR}/config" -v "${@}"
|
||||
else
|
||||
ssh -F "${SSH_CONFIG_DIR}/config" "${@}"
|
||||
|
@ -5,7 +5,7 @@ set -e
|
||||
SCRIPT_DIR=$(realpath "$(dirname "${0}")")
|
||||
WORKSPACE=$(realpath "${SCRIPT_DIR}/..")
|
||||
GATE_UTILS=${WORKSPACE}/tools/g2/lib/all.sh
|
||||
TEMP_DIR=$(mktemp -d)
|
||||
TEMP_DIR=${TEMP_DIR:-$(mktemp -d)}
|
||||
chmod -R 755 "${TEMP_DIR}"
|
||||
|
||||
GATE_COLOR=${GATE_COLOR:-1}
|
||||
@ -37,14 +37,8 @@ while read -u 3 stage; do
|
||||
NAME=$(echo "${stage}" | jq -r .name)
|
||||
STAGE_CMD=${STAGES_DIR}/$(echo "${stage}" | jq -r .script)
|
||||
|
||||
if echo "${stage}" | jq -e .arguments > /dev/null; then
|
||||
ARGUMENTS=($(echo "${stage}" | jq -r '.arguments[]'))
|
||||
else
|
||||
ARGUMENTS=
|
||||
fi
|
||||
|
||||
log_stage_header "${NAME}"
|
||||
if $STAGE_CMD ${ARGUMENTS[*]}; then
|
||||
if echo "${stage}" | jq -r '.arguments | @sh' | xargs "${STAGE_CMD}" ; then
|
||||
log_stage_success
|
||||
else
|
||||
log_color_reset
|
||||
|
Loading…
Reference in New Issue
Block a user