[ga] clean up code to use archive.debian.org for EOL debians

Author: k-okada

.travis.sh

@@ -32,27 +32,14 @@ function travis_time_end {
 if [ "$TRAVIS_OS_NAME" == "linux" ]; then 
 
     travis_time_start setup.apt-get_update
-    if [[ "$DOCKER_IMAGE" == *"jessie" ]] ; then
-        # Jessie is EOL, rewrite sources.list and configure apt
-        # http://archive.debian.org/debian-archive/
-        DIST_NAME="jessie"
-        echo "Rewriting /etc/apt/sources.list for ${DIST_NAME}"
-        echo "deb http://archive.debian.org/debian/ ${DIST_NAME} main" > /etc/apt/sources.list
-        echo "deb http://archive.debian.org/debian-security/ ${DIST_NAME}/updates main" >> /etc/apt/sources.list
-        printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update
-    fi
-    if [[ "$DOCKER_IMAGE" == *"stretch" ]] ; then
-        cat /etc/apt/sources.list
-        sed -i [email protected]@archive.debian.org@ /etc/apt/sources.list;
-        sed -i [email protected]@archive.debian.org@ /etc/apt/sources.list;
-        sed -i [email protected]/[email protected]/debian-security@ /etc/apt/sources.list
-        sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list
-    fi
-    if [[ "$DOCKER_IMAGE" == *"buster" ]] ; then
+    if [[ "$DOCKER_IMAGE" == *"jessie"  || "$DOCKER_IMAGE" == *"stretch"  || "$DOCKER_IMAGE" == *"buster" ]] ; then
+        # Busteris EOL, rewrite sources.list and configure apt
         cat /etc/apt/sources.list
-        sed -i '[email protected]/debian [email protected]/debian buster@' /etc/apt/sources.list;
+        echo "Rewriting /etc/apt/sources.list"
+        sed -i '[email protected]/[email protected]/debian@' /etc/apt/sources.list;
         sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list
         cat /etc/apt/sources.list
+        printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update
     fi
     if [ ! -e /usr/bin/sudo ] ; then apt-get update && apt-get install -y --force-yes sudo;  else sudo apt-get update; fi
     travis_time_end