diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-05-17 12:46:05 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-05-17 12:46:05 +0000 |
| commit | 1ff1a6bb013416b22f0645c30aa85dcb288652f2 (patch) | |
| tree | 3452c464c7aba85b6b72f876def8adc8f2177e9e | |
| parent | 50641392dadd18599f3d942ea9465894f351d04d (diff) | |
jenkins-helper.sh, start-container-*.sh: Remove unneeded option
We forward ssh-agent by default in .ssh/config.
Change-Id: I30d2b71ff07b2a2fbee7c130de91059de5d3ade4
| -rw-r--r-- | jenkins-helpers.sh | 2 | ||||
| -rwxr-xr-x | start-container-docker.sh | 4 | ||||
| -rwxr-xr-x | start-container-none.sh | 2 | ||||
| -rwxr-xr-x | start-container-schroot.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index 09a9c78c..58c120ed 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -121,5 +121,5 @@ remote_exec () cmd=() # Add quotes to every parameter for i in "$@"; do cmd+=($(printf '%q' "$i")); done - ssh ${port:+-p$port} -A $host "${dir:+cd "$(printf '%q' "$dir")" &&} exec ${cmd[@]}" + ssh ${port:+-p$port} $host "${dir:+cd "$(printf '%q' "$dir")" &&} exec ${cmd[@]}" } diff --git a/start-container-docker.sh b/start-container-docker.sh index 9a9e399f..aaed94b6 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -247,13 +247,13 @@ exec 1>&3 2>&4 cat <<EOF # v1 interface -CONTAINER="ssh -p ${session_port} -A ${session_host}" +CONTAINER="ssh -p ${session_port} ${session_host}" CONTAINER_CLEANUP="${CONTAINER_CLEANUP}" session_host=${session_host} session_port=${session_port} # v2 interface -${prefix}CONTAINER_RSH="ssh -p ${session_port} -A ${session_host}" +${prefix}CONTAINER_RSH="ssh -p ${session_port} ${session_host}" ${prefix}container_cleanup () { ${CONTAINER_CLEANUP} diff --git a/start-container-none.sh b/start-container-none.sh index f8b1036c..1c66d061 100755 --- a/start-container-none.sh +++ b/start-container-none.sh @@ -123,7 +123,7 @@ exec 1>&3 2>&4 cat <<EOF ulimit -u 5000 # FIXME: Does not work remotely -CONTAINER="ssh -p ${session_port} -A ${session_host}" +CONTAINER="ssh -p ${session_port} ${session_host}" CONTAINER_CLEANUP="" session_host=${session_host} session_port=${session_port} diff --git a/start-container-schroot.sh b/start-container-schroot.sh index eb212ec4..f34fab9d 100755 --- a/start-container-schroot.sh +++ b/start-container-schroot.sh @@ -90,7 +90,7 @@ esac session_port=22 schroot_image="tcwg-${task}-${container_arch}-${distro}" -SCHROOT="ssh -p ${session_port} -A ${session_host} schroot" +SCHROOT="ssh -p ${session_port} ${session_host} schroot" session_id=$(${SCHROOT} -b -c chroot:$schroot_image --preserve-environment) if [ x"$session_id" = x ]; then |