release-tarball-build-dist: move rsync into docker
Prepare to use ssh inside the docker container to check if tarballs already exist, see the next patch. Remove the '' around UserKnownHostsFile as using SSH_COMMAND in the next patch without rsync fails otherwise with: command-line: line 0: Bad configuration option: 'userknownhostsfile Change-Id: I6dfe5d587d05063c6cf2c9ec683e7b7e499b79c1
This commit is contained in:
parent
59f3aa83d5
commit
c4f160e2c2
|
@ -67,6 +67,7 @@ RUN apt-get update && \
|
||||||
make \
|
make \
|
||||||
mscgen \
|
mscgen \
|
||||||
python3-nwdiag \
|
python3-nwdiag \
|
||||||
|
rsync \
|
||||||
xsltproc \
|
xsltproc \
|
||||||
&& \
|
&& \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
|
@ -8,21 +8,13 @@ docker_images_require \
|
||||||
docker run \
|
docker run \
|
||||||
--rm=true \
|
--rm=true \
|
||||||
-v "$PWD:/build" \
|
-v "$PWD:/build" \
|
||||||
|
-v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \
|
||||||
-w /osmo-ci \
|
-w /osmo-ci \
|
||||||
-e KEEP_TEMP="$KEEP_TEMP" \
|
-e KEEP_TEMP="$KEEP_TEMP" \
|
||||||
|
-e SSH_AUTH_SOCK=/ssh-agent \
|
||||||
"$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh
|
"$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh
|
||||||
|
|
||||||
if [ -z "$WORKSPACE" ]; then
|
if [ -z "$WORKSPACE" ]; then
|
||||||
set +x
|
set +x
|
||||||
echo "NOTE: not running on jenkins, skipping upload"
|
echo "NOTE: not running on jenkins, skipping upload"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat > "$WORKSPACE/known_hosts" <<EOF
|
|
||||||
[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
|
|
||||||
[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
|
|
||||||
[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
|
|
||||||
EOF
|
|
||||||
|
|
||||||
SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
|
|
||||||
cd _release_tarballs
|
|
||||||
rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
|
||||||
|
[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
|
||||||
|
[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
|
|
@ -6,6 +6,7 @@
|
||||||
# Environment variables:
|
# Environment variables:
|
||||||
# * KEEP_TEMP: do not delete cloned repositories (use for development)
|
# * KEEP_TEMP: do not delete cloned repositories (use for development)
|
||||||
# * PARALLEL_MAKE: -jN argument for make (default: -j5).
|
# * PARALLEL_MAKE: -jN argument for make (default: -j5).
|
||||||
|
SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48"
|
||||||
OSMO_GIT_URL="https://git.osmocom.org"
|
OSMO_GIT_URL="https://git.osmocom.org"
|
||||||
OSMO_RELEASE_REPOS="
|
OSMO_RELEASE_REPOS="
|
||||||
libasn1c
|
libasn1c
|
||||||
|
@ -315,6 +316,11 @@ create_move_tarball() {
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
upload() {
|
||||||
|
cd _release_tarballs
|
||||||
|
rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/
|
||||||
|
}
|
||||||
|
|
||||||
remove_temp_dir
|
remove_temp_dir
|
||||||
mkdir -p "$TEMP/repos"
|
mkdir -p "$TEMP/repos"
|
||||||
echo "Temp dir: $TEMP"
|
echo "Temp dir: $TEMP"
|
||||||
|
@ -346,4 +352,5 @@ for repo in $OSMO_RELEASE_REPOS; do
|
||||||
done
|
done
|
||||||
|
|
||||||
remove_temp_dir
|
remove_temp_dir
|
||||||
|
upload
|
||||||
echo "done!"
|
echo "done!"
|
||||||
|
|
Loading…
Reference in New Issue