From c246b7f9914f940999948bf9d4608a0ed9e6b0dc Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Sat, 29 Feb 2020 14:28:05 -0500 Subject: [PATCH] [distros] Dropped support for Debian 9 and Ubuntu 16 #169 Closes #169 --- .gitlab-ci.yml | 20 ++++++++++---------- .travis.yml | 19 +++++++++---------- README.md | 5 +---- handlers/main.yml | 2 +- meta/main.yml | 8 ++++++-- tasks/apt.yml | 8 -------- tasks/variables-spatialite.yml | 9 --------- tests/runtests.sh | 8 -------- 8 files changed, 27 insertions(+), 52 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2352fffa..ba2063d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,11 +101,11 @@ terraform-apply: dependencies: - terraform-plan -Ubuntu1604: - variables: - distro: 'ubuntu:16.04' - playbook: test.yml - <<: *testing_script +# Ubuntu1604: +# variables: +# distro: 'ubuntu:16.04' +# playbook: test.yml +# <<: *testing_script Ubuntu1804: variables: @@ -113,11 +113,11 @@ Ubuntu1804: playbook: test.yml <<: *testing_script -Debian9: - variables: - distro: debian:9 - playbook: test.yml - <<: *testing_script +# Debian9: +# variables: +# distro: debian:9 +# playbook: test.yml +# <<: *testing_script Debian10: variables: diff --git a/.travis.yml b/.travis.yml index f12675e0..05153a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,27 +11,26 @@ env: matrix: - distro: 'ubuntu:18.04' playbook: test.yml - - distro: debian:9 - playbook: test.yml - distro: debian:10 playbook: test.yml - distro: 'ubuntu:18.04' playbook: test_networktopology.yml # we don't have the resources now to maintain these distros + # - distro: debian:9 + # playbook: test.yml # - distro: fedora:27 # playbook: test.yml # - distro: fedora:28 # playbook: test.yml # - distro: centos:7 # playbook: test.yml - -matrix: - include: - - dist: trusty - python: "3.5" - env: - - distro: 'ubuntu:16.04' - playbook: test.yml +# matrix: +# include: +# - dist: trusty +# python: "3.5" +# env: +# - distro: 'ubuntu:16.04' +# playbook: test.yml script: # Configure test script so we can run extra tests after playbook is run. diff --git a/README.md b/README.md index cfabaf83..fadbbfd7 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,6 @@ Substitute `openwisp2.mydomain.com` with your **production server**'s hostname - `openwisp2.mydomain.com` WITH AN IP ADDRESS**, otherwise email sending through postfix will break, causing 500 internal server errors on some operations. - Create playbook file -------------------- @@ -273,9 +272,7 @@ Pull docker image with this command: Substitute `` with one of these variants: * `ubuntu:18.04` -* `ubuntu:16.04` * `debian:10` -* `debian:9` **Step 4**: Run docker container @@ -322,7 +319,7 @@ customisations of *OpenWISP*. ### Installing Debian 9 on VirtualBox Install [VirtualBox](https://virtualbox.org) and create a new Virtual Machine running -Debian 9. A step-by-step guide is available +Debian 10. A step-by-step guide is available [here](http://www.brianlinkletter.com/installing-debian-linux-in-a-virtualbox-virtual-machine/), however we need to change a few things to get ansible working. diff --git a/handlers/main.yml b/handlers/main.yml index 4ab00113..b36039ea 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,7 +4,7 @@ - name: reload systemd systemd: daemon_reload=yes - when: ansible_distribution_release in ['xenial', 'bionic'] and ansible_service_mgr == 'systemd' + when: ansible_distribution_release in ['bionic'] and ansible_service_mgr == 'systemd' - name: reload supervisor command: supervisorctl reload diff --git a/meta/main.yml b/meta/main.yml index bd76a4e0..269b9130 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,11 +16,15 @@ galaxy_info: platforms: - name: Debian versions: - - stretch + # (send patch if you want this to be supported!) + # https://github.com/openwisp/ansible-openwisp2/issues/169#issuecomment-592983139 + # - stretch - buster - name: Ubuntu versions: - - xenial + # (send patch if you want this to be supported!) + # https://github.com/openwisp/ansible-openwisp2/issues/169#issuecomment-592983139 + # - xenial - bionic # we don't have the resources now to maintain these distros # - name: Fedora diff --git a/tasks/apt.yml b/tasks/apt.yml index e7ba5363..91925628 100644 --- a/tasks/apt.yml +++ b/tasks/apt.yml @@ -103,14 +103,6 @@ register: result until: result is success -- name: Install python3-pyparsing - when: ansible_distribution == "Debian" and ansible_distribution_version == "9.0" - apt: name=python3-pyparsing - retries: 5 - delay: 10 - register: result - until: result is success - - name: Install python wheel (optional, allowed to fail) ignore_errors: yes apt: diff --git a/tasks/variables-spatialite.yml b/tasks/variables-spatialite.yml index 882a2a6b..fad003d2 100644 --- a/tasks/variables-spatialite.yml +++ b/tasks/variables-spatialite.yml @@ -6,12 +6,3 @@ and ansible_distribution_version is version_compare('18.04', 'ge')) or (ansible_distribution == 'Debian' and ansible_distribution_version is version_compare('10', 'ge')) - -- name: Set spatialite_path (Ubuntu >= 16.04 or Debian >= 9) - set_fact: - openwisp2_spatialite_path: "mod_spatialite" - when: > - (ansible_distribution == 'Ubuntu' - and ansible_distribution_version is version_compare('16.04', 'ge')) - or (ansible_distribution == 'Debian' - and ansible_distribution_version is version_compare('9', 'ge')) diff --git a/tests/runtests.sh b/tests/runtests.sh index 53f1e8f1..27fef8c4 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -28,18 +28,10 @@ if [ $distro = "centos:7" ]; then elif [ $distro = "ubuntu:18.04" ]; then init="/lib/systemd/systemd" opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" -# Ubuntu 16.04 -elif [ $distro = "ubuntu:16.04" ]; then - init="/lib/systemd/systemd" - opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" # Debian 10 elif [ $distro = "debian:10" ]; then init="/lib/systemd/systemd" opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" -# Debian 9 -elif [ $distro = "debian:9" ]; then - init="/lib/systemd/systemd" - opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" fi # Run the container using the supplied OS