diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-01 15:41:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 15:41:33 -0500 |
| commit | 0ba47f71c0dd829114666d13776792f748682be3 (patch) | |
| tree | 9795329ac9fbdd32b54e22babaa3484ebd934fee /hack | |
| parent | 745fa4ac94c3ec99becd85f59d1b59c2c9765527 (diff) | |
| parent | 545eeca8ea3d8736ec8646a6cd27d94b9a61e2c7 (diff) | |
| download | podman-0ba47f71c0dd829114666d13776792f748682be3.tar.gz podman-0ba47f71c0dd829114666d13776792f748682be3.tar.bz2 podman-0ba47f71c0dd829114666d13776792f748682be3.zip | |
Merge pull request #9179 from cevich/v3.0_fix_validate
[v3.0] Cirrus: Fix running Validate task on branches
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/get_ci_vm.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index d1e38eb35..4f6c42a06 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -157,11 +157,14 @@ parse_args(){ VM_IMAGE_NAME="$1" - # Word-splitting is desirable in this case - # shellcheck disable=SC2207 + # Word-splitting is desirable in this case. + # Values are used literally (with '=') as args to future `env` command. + # get_env_vars() will take care of properly quoting it's output. + # shellcheck disable=SC2207,SC2191 ENVS=( $(get_env_vars) - "VM_IMAGE_NAME=$VM_IMAGE_NAME" + VM_IMAGE_NAME="$VM_IMAGE_NAME" + UPSTREAM_REMOTE="upstream" ) VMNAME="${VMNAME:-${USER}-${VM_IMAGE_NAME}}" @@ -263,7 +266,7 @@ echo -e "Note: Script can be re-used in another terminal if needed." echo -e "${RED}(option to delete VM presented upon exiting).${NOR}" # TODO: This is fairly fragile, specifically the quoting for the remote command. echo '#!/bin/bash' > $TMPDIR/ssh -echo "$SSH_CMD -- -t 'cd $GOSRC && exec env \"${ENVS[*]}\" bash -il'" >> $TMPDIR/ssh +echo "$SSH_CMD -- -t 'cd $GOSRC && exec env ${ENVS[*]} bash -il'" >> $TMPDIR/ssh chmod +x $TMPDIR/ssh showrun $TMPDIR/ssh |