Commit e0fa8b82 authored by intrigeri's avatar intrigeri
Browse files

Revert "Release process: unite BitTorrent download folders" (Closes: #16902)

Giving both Torrents the same name has problematic side effects.

For example, if someone downloads both Torrents at the same time (USB image +
ISO):

 - The UI in a Bittorrent client does not allow to tell, at a glance, which
   is which.
 - If they use a BitTorrent client configured to download first to a temporary
   folder and then move the downloaded files elsewhere (e.g. kibi tells me most
   documentations for rtorrent recommend that), then when the 1st Torrent
   download completes, it breaks the 2nd one, deleting all files that were
   partially downloaded already.

So let's revert to having the Torrents download directories whose
names end respectively with -iso and -img.

This reverts most of commit a8964667, except the
part that got rid of permanent -iso and -img folders on the RM's filesystem,
which I assume is what made anonym unhappy with my initial implementation.

I've tried to salvage the hotfixes kibi and I had to do at release time, to fix
issues introduced by me while I did the first part of #16902 and later by anonym
in a89646.

I'll be the first one to go through the updated doc when I'll prepare 4.0~rc1
and 4.0, so I'll have the opportunity to notice and fix any breakage introduced
by this commit before it affects anyone else.
parent 2f42bc49
......@@ -740,8 +740,8 @@ files metadata:
gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *".${type:?}" && \
rename 's,\.asc$,.sig,' *.asc && \
tmp="$(mktemp -d)" && \
mkdir -p "${tmp:?}/tails-amd64-${VERSION:?}" && \
cd "${tmp:?}/tails-amd64-${VERSION:?}" && \
mkdir -p "${tmp:?}/tails-amd64-${VERSION:?}-${type:?}" && \
cd "${tmp:?}/tails-amd64-${VERSION:?}-${type:?}" && \
for x in "${ISOS:?}/tails-amd64-${VERSION:?}"/*.${type:?}*; do
ln -s ${x} .
done && \
......@@ -749,7 +749,7 @@ files metadata:
-o "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}.torrent" \
-a 'udp://tracker.torrent.eu.org:451' \
-a 'udp://tracker.coppersurfer.tk:6969' \
"${tmp:?}/tails-amd64-${VERSION:?}" && \
"${tmp:?}/tails-amd64-${VERSION:?}-${type:?}" && \
transmission-show "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}.torrent" && \
cd - && \
rm -rf "${tmp:?}"
......@@ -1116,26 +1116,26 @@ Now you can announce and seed the Torrents for the release you're preparing:
cat "${RELEASE_CHECKOUT:?}/wiki/src/tails-signing.key" \
| ssh bittorrent.lizard gpg --import
images_dirname="tails-amd64-${VERSION:?}"
transmission_dl_version_dir="/var/lib/transmission-daemon/downloads/${images_dirname:?}"
for type in iso img ; do
image_filename="tails-amd64-${VERSION:?}.${type:?}"
torrent_dirname="tails-amd64-${VERSION:?}-${type:?}"
scp \
"${ISOS:?}/${image_filename:?}.torrent" \
"${ISOS:?}/${images_dirname:?}/${image_filename:?}.sig" \
"${ISOS:?}/tails-amd64-${VERSION:?}/${image_filename:?}.sig" \
bittorrent.lizard: && \
ssh bittorrent.lizard << EOF
install -d -g debian-transmission --mode 0755 \
"${transmission_dl_version_dir:?}" && \
wget --quiet \
mkdir --mode 0755 "${torrent_dirname:?}" && \
cd "${torrent_dirname:?}" && \
mv "../${image_filename:?}.sig" . && \
wget \
"https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/${image_filename:?}" && \
gpg --verify ${image_filename:?}{.sig,} && \
chgrp debian-transmission "${image_filename:?}"* && \
chmod go+rX,g+w "${image_filename:?}"* && \
cd && \
chgrp -R debian-transmission "${torrent_dirname:?}" && \
chmod -R go+rX,g+w "${torrent_dirname:?}" && \
mv \
"${image_filename:?}" \
"${image_filename:?}.sig" \
"${transmission_dl_version_dir:?}" && \
"${torrent_dirname:?}" \
/var/lib/transmission-daemon/downloads/ && \
transmission-remote --add ${image_filename:?}.torrent \
--find /var/lib/transmission-daemon/downloads/
EOF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment