summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Picus <diana.picus@linaro.org>2020-05-25 10:53:52 +0200
committerDiana Picus <diana.picus@linaro.org>2020-06-01 10:19:50 +0000
commit51f0b1c6d1efe5c73fd5319ea007eabee83b3b6c (patch)
treedaad5ed6d55111f6b78d4b7cb848af4a4d29997e
parentd598d1c7c2f87ba80ad6e9554bdb816b1cab538e (diff)
tcwg-llvm-release: Use port 22 for copying binaries
We're doing this because our .ssh/config connects to the host container on dev-01 by default, and that doesn't have the upload directory mapped. Change-Id: I80305eb168abd62eab95ce6c627178593a52a905
-rwxr-xr-xtcwg-llvm-release.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh
index 488cfd1f..f21b4f5b 100755
--- a/tcwg-llvm-release.sh
+++ b/tcwg-llvm-release.sh
@@ -198,8 +198,10 @@ PKGNAME="$(push_binary_name "$PKGTAG" "$TARGET")"
PUSHTYPE="releases"
PUSHDIR="$(push_binary_dir "$PUSHTYPE")"
-ssh $PUSHSERVER mkdir -p $PUSHDIR
-cd "$WORKSPACE/$RCDIR" && scp "$PKGNAME.$PUSHSUFFIX" "$(push_scp_url "$PUSHTYPE")"
+# Force port 22, otherwise our .ssh/config will connect to the host container by
+# default and we won't be able to access the upload directory
+ssh -p 22 $PUSHSERVER mkdir -p $PUSHDIR
+cd "$WORKSPACE/$RCDIR" && scp -P 22 "$PKGNAME.$PUSHSUFFIX" "$(push_scp_url "$PUSHTYPE")"
# Dump URL
echo "TOOLCHAIN URL: $(push_wget_url "$PKGTAG" "$TARGET" "$PUSHTYPE")"