Bug 1835730 - Use archive.debian.org for Debian jessie. r=jcristau

Differential Revision: https://phabricator.services.mozilla.com/D179406

taskcluster/ci/docker-image/kind.yml

@@ -82,7 +82,6 @@ jobs:
         args:
             BASE_IMAGE: debian:jessie-20210208
             DIST: jessie
-            SNAPSHOT: '20210208T213147Z'
     debian8-packages:
         symbol: I(deb8-pkg)
         definition: debian-packages
@@ -93,7 +92,6 @@ jobs:
         args:
             BASE_IMAGE: i386/debian:jessie-20210208
             DIST: jessie
-            SNAPSHOT: '20210208T213147Z'
     debian8-i386-packages:
         symbol: I(deb8-32-pkg)
         definition: debian-packages

taskcluster/docker/debian-raw/Dockerfile

@@ -18,15 +18,18 @@ ARG SNAPSHOT
 ARG TASKCLUSTER_ROOT_URL
 # Set apt sources list to a snapshot.
 # Note: the use of gpgvnoexpkeysig is because the Debian Jessie GPG key expired.
-RUN if [ -n "$SNAPSHOT" -a -n "$DIST" ]; then for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-security_$DIST-security debian-debug_$DIST-debug debian-debug_$DIST-proposed-updates-debug debian-debug_$DIST-backports-debug; do \
+RUN if [ -n "$DIST" ]; then for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-security_$DIST-security debian-debug_$DIST-debug debian-debug_$DIST-proposed-updates-debug debian-debug_$DIST-backports-debug; do \
       case "$s" in \
-      debian_jessie-backports) \
+      debian-debug_jessie*|debian_jessie-updates) \
-          echo "deb http://snapshot.debian.org/archive/debian-archive/20190328T105444Z/debian/ ${s#*_} main"; \
+          : No debian-debug/updates archive for Jessie; \
           ;; \
-      debian-debug_jessie*) \
+      debian-security_jessie-security) \
-          : No debian-debug archive for Jessie; \
+          echo "deb http://archive.debian.org/debian-security/ jessie/updates main"; \
           ;; \
-      debian-security_jessie-security|debian-security_buster-security) \
+      debian*_jessie*) \
+          echo "deb http://archive.debian.org/${s%_*}/ ${s#*_} main"; \
+          ;; \
+      debian-security_buster-security) \
           d=${s#*_}; \
           echo "deb http://snapshot.debian.org/archive/${s%_*}/$SNAPSHOT/ ${d%-security}/updates main"; \
           ;; \

taskcluster/docker/debian-repackage/Dockerfile

@@ -30,5 +30,5 @@ RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAG
         --verbose \
         jessie \
         /srv/jessie-$arch \
-        http://snapshot.debian.org/archive/debian/20210208T213147Z; \
+        https://archive.debian.org/debian; \
     done

taskcluster/scripts/misc/build-sysroot.sh

@@ -5,7 +5,6 @@ set -e
 
 arch=$1
 shift
-SNAPSHOT=20210208T213147Z
 
 sysroot=$(basename $TOOLCHAIN_ARTIFACT)
 sysroot=${sysroot%%.*}
@@ -38,6 +37,16 @@ arm64)
   ;;
 esac
 
+case "$dist" in
+jessie)
+  repo_url=https://archive.debian.org/debian
+  ;;
+*)
+  SNAPSHOT=20210208T213147Z
+  repo_url=http://snapshot.debian.org/archive/debian/$SNAPSHOT
+  ;;
+esac
+
 packages="
   linux-libc-dev
   libasound2-dev
@@ -62,7 +71,7 @@ packages="
 # useful to build.
 queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
 (
-  echo "deb http://snapshot.debian.org/archive/debian/$SNAPSHOT $dist main"
+  echo "deb $repo_url $dist main"
   for task in $PACKAGES_TASKS; do
     echo "deb [trusted=yes] $queue_base/task/$task/artifacts/public/build/ apt/"
   done