Skip to content

Commit

Permalink
Deprecate support for ubuntu xenial and debian stretch
Browse files Browse the repository at this point in the history
The two distributions are now deprecated due to missing python3 compatibility and missing security dependencies
  • Loading branch information
evilaliv3 committed Dec 7, 2019
1 parent ff0a30f commit cd614d6
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 135 deletions.
18 changes: 0 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,10 @@ matrix:
dist: bionic
python: "3.6"

- env: GLTEST='py2_test' TESTS_REQUIREMENTS='xenial'
dist: xenial
python: "2.7"
addons:
chrome: stable

- env: GLTEST='build_and_install' BUILD_DISTRO='bionic'
dist: bionc
python: "3.6"

- env: GLTEST='build_and_install' BUILD_DISTRO='xenial'
dist: bionic
python: "3.6"

- env: GLTEST='build_and_install' BUILD_DISTRO='stretch'
dist: bionic
python: "3.6"

- env: GLTEST='docker'
dist: bionic
python: "3.6"
Expand Down Expand Up @@ -86,10 +72,6 @@ matrix:
sauce_connect: true

allow_failures:
- env: GLTEST='py2_test' TESTS_REQUIREMENTS='xenial'
- env: GLTEST='build_and_install' BUILD_DISTRO='bionic'
- env: GLTEST='build_and_install' BUILD_DISTRO='xenial'
- env: GLTEST='build_and_install' BUILD_DISTRO='stretch'
- env: GLTEST='docker'
- env: GLTEST='end2end-0' BROWSER='chrome 78'
- env: GLTEST='end2end-1' BROWSER='firefox 70'
Expand Down
12 changes: 6 additions & 6 deletions backend/globaleaks/tests/jobs/test_update_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@

packages=b"Package: globaleaks\n" \
b"Version: 0.0.1\n" \
b"Filename: xenial/globaleaks_1.0.0_all.deb\n\n" \
b"Filename: buster/globaleaks_1.0.0_all.deb\n\n" \
b"Package: globaleaks\n" \
b"Version: 1.0.0\n" \
b"Filename: xenial/globaleaks_1.0.0_all.deb\n\n" \
b"Filename: buster/globaleaks_1.0.0_all.deb\n\n" \
b"Package: globaleaks\n" \
b"Version: 1.2.3\n" \
b"Filename: xenial/globaleaks_1.0.0_all.deb\n\n" \
b"Filename: buster/globaleaks_1.0.0_all.deb\n\n" \
b"Package: globaleaks\n" \
b"Version: 2.0.666\n" \
b"Filename: xenial/globaleaks_2.0.9_all.deb\n\n" \
b"Filename: buster/globaleaks_2.0.9_all.deb\n\n" \
b"Package: globaleaks\n" \
b"Version: 2.0.1337\n" \
b"Filename: xenial/globaleaks_2.0.100_all.deb\n\n" \
b"Filename: buster/globaleaks_2.0.100_all.deb\n\n" \
b"Package: tor2web\n" \
b"Version: 31337\n" \
b"Filename: xenial/tor2web_31337_all.deb\n\n"
b"Filename: buster/tor2web_31337_all.deb\n\n"


class TestUpdateCheck(helpers.TestGLWithPopulatedDB):
Expand Down
45 changes: 0 additions & 45 deletions debian/controlX/control.stretch

This file was deleted.

43 changes: 0 additions & 43 deletions debian/controlX/control.xenial

This file was deleted.

2 changes: 1 addition & 1 deletion documentation/l10n/en/gettingstarted/Requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Software requirements
---------------------
GlobaLeaks is designed to run on GNU/Linux and developed and tested specifically for Debian 10 (Buster)

The software lifecycle of the platform includes full support for all Debian and Ubuntu LTS versions starting from Debian 9 and Ubuntu 16.04.
The software lifecycle of the platform includes full support for all Debian and Ubuntu LTS versions starting from Debian 10 and Ubuntu 18.04.

On these platforms the support is guaranteed following the `Release End of Life <https://www.ubuntu.com/info/release-end-of-life>`_ defined by Ubuntu.

Expand Down
6 changes: 3 additions & 3 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

TARGETS="bionic xenial buster stretch"
DISTRIBUTION="bionic"
TARGETS="buster bionic"
DISTRIBUTION="buster"
TAG="master"
LOCAL_ENV=0
NOSIGN=0
Expand All @@ -15,7 +15,7 @@ usage() {
echo " -h"
echo -e " -t tagname (build specific release/branch)"
echo -e " -l (Use local repository & enviroment)"
echo -e " -d distribution (available: bionic, xenial, stretch)"
echo -e " -d distribution (available: buster, bionic)"
echo -e " -n (do not sign)"
echo -e " -p (push on repository)"
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ echo " + required TCP sockets open"
# Depending on the intention of the user to proceed anyhow installing on
# a not supported distro we using the experimental package if it exists
# or Bionic as fallback.
if echo "$DISTRO_CODENAME" | grep -vqE "^(bionic|buster|stretch|xenial)$"; then
if echo "$DISTRO_CODENAME" | grep -vqE "^(buster|bionic)$"; then
# In case of unsupported platforms we fallback on Bionic
echo "No packages available for the current distribution; the install script will use the Bionic repository."
echo "In case of a failure refer to the wiki for manual setup possibilities."
Expand Down
20 changes: 2 additions & 18 deletions travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ setupClientDependencies() {
setupBackendDependencies() {
cd $TRAVIS_BUILD_DIR/backend # to install backend dependencies
rm -rf requirements.txt
if [ "$GLTEST" = "py2_test" ]; then
pip install -r requirements/requirements-xenial.txt
else
pip3 install -r requirements/requirements-bionic.txt
fi
pip3 install -r requirements/requirements-bionic.txt
}

setupDependencies() {
Expand Down Expand Up @@ -103,28 +99,16 @@ elif [ "$GLTEST" = "build_and_install" ]; then
sudo debootstrap --arch=amd64 bionic "$chroot" http://archive.ubuntu.com/ubuntu/
sudo su -c 'echo "deb http://archive.ubuntu.com/ubuntu bionic main universe" > /tmp/globaleaks_chroot/etc/apt/sources.list'
sudo su -c 'echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main universe" >> /tmp/globaleaks_chroot/etc/apt/sources.list'
elif [ $BUILD_DISTRO = "xenial" ]; then
sudo debootstrap --arch=amd64 xenial "$chroot" http://archive.ubuntu.com/ubuntu/
sudo su -c 'echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /tmp/globaleaks_chroot/etc/apt/sources.list'
sudo su -c 'echo "deb http://archive.ubuntu.com/ubuntu xenial-updates main universe" >> /tmp/globaleaks_chroot/etc/apt/sources.list'
elif [ $BUILD_DISTRO = "buster" ]; then
sudo debootstrap --arch=amd64 buster "$chroot" http://deb.debian.org/debian/
sudo su -c 'echo "deb http://deb.debian.org/debian buster main contrib" > /tmp/globaleaks_chroot/etc/apt/sources.list'
sudo su -c 'echo "deb http://deb.debian.org/debian buster main contrib" >> /tmp/globaleaks_chroot/etc/apt/sources.list'
elif [ $BUILD_DISTRO = "stretch" ]; then
sudo debootstrap --arch=amd64 stretch "$chroot" http://deb.debian.org/debian/
sudo su -c 'echo "deb http://deb.debian.org/debian stretch main contrib" > /tmp/globaleaks_chroot/etc/apt/sources.list'
sudo su -c 'echo "deb http://deb.debian.org/debian stretch main contrib" >> /tmp/globaleaks_chroot/etc/apt/sources.list'
fi

if [ $BUILD_DISTRO = "bionic" ] || [ $BUILD_DISTRO = "xenial" ]; then
if [ $BUILD_DISTRO = "bionic" ]; then
sudo mount --rbind /dev/pts "$chroot/dev/pts"
fi

if [ $BUILD_DISTRO = "xenial" ]; then
sudo mount --rbind /dev/shm "$chroot/dev/shm"
fi

sudo mount --rbind /proc "$chroot/proc"
sudo mount --rbind /sys "$chroot/sys"

Expand Down

0 comments on commit cd614d6

Please sign in to comment.