From b7de8e615ffd51f4268b11cc1595ce2efe98cb57 2020-05-05 22:59:06
From: Branko Majic <branko@majic.rs>
Date: 2020-05-05 22:59:06
Subject: [PATCH] MAR-152: Drop support for Debian 8 Jessie from the wsgi_website role.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 68f80de3498ba2781585f7dc3c2e84575de2931b..1af1babd12d47e00a32dfe3f263f9fd2f0b7deae 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -1898,7 +1898,6 @@ Distribution compatibility
 
 Role is compatible with the following distributions:
 
-- Debian 8 (Jessie)
 - Debian 9 (Stretch)
 
 
diff --git a/roles/wsgi_website/defaults/main.yml b/roles/wsgi_website/defaults/main.yml
index dbaf3ccef43a5ab4ae74261e8fa70fef5abb3866..27fe4ec967bcfcb691e3ab8abf945de37ed9ecb5 100644
--- a/roles/wsgi_website/defaults/main.yml
+++ b/roles/wsgi_website/defaults/main.yml
@@ -23,4 +23,3 @@ admin: "admin-{{ fqdn | replace('.', '_') }}"
 user: "web-{{ fqdn | replace('.', '_') }}"
 home: "/var/www/{{ fqdn }}"
 python_interpreter: "/usr/bin/python{{ python_version }}"
-no_setuptools: "{% if ansible_distribution_release == 'jessie' %}{% elif ansible_distribution_release == 'stretch' %}--no-setuptools{% endif %}"
diff --git a/roles/wsgi_website/molecule/default/molecule.yml b/roles/wsgi_website/molecule/default/molecule.yml
index a9c11bfa5383219ed8150354a82a62da55553060..1390b652ad9e5375ce15839307e591fcbb205a35 100644
--- a/roles/wsgi_website/molecule/default/molecule.yml
+++ b/roles/wsgi_website/molecule/default/molecule.yml
@@ -14,16 +14,6 @@ lint:
 
 platforms:
 
-  - name: wsgi-website-jessie64
-    groups:
-      - wsgi-website
-      - parameters-mandatory
-      - parameters-optional
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 512
-    cpus: 1
-
   - name: wsgi-website-stretch64
     groups:
       - wsgi-website
diff --git a/roles/wsgi_website/molecule/default/playbook.yml b/roles/wsgi_website/molecule/default/playbook.yml
index 8773c81470270e67a72342f17e199e8c129e11eb..a4643d6c3efe3352b527bb414402abcc37a6a9f6 100644
--- a/roles/wsgi_website/molecule/default/playbook.yml
+++ b/roles/wsgi_website/molecule/default/playbook.yml
@@ -38,8 +38,7 @@
       https_tls_certificate: "{{ lookup('file', 'tests/data/x509/parameters-optional.local_https.cert.pem') }}"
       https_tls_key: "{{ lookup('file', 'tests/data/x509/parameters-optional.local_https.key.pem') }}"
       packages:
-        - "{% if ansible_distribution_release == 'jessie' %}libmariadb-client-lgpl-dev-compat\
-{% elif ansible_distribution_release == 'stretch' %}libmariadbclient-dev-compat{% endif %}"
+        - "libmariadbclient-dev-compat"
         - global
       proxy_headers:
         Accept-Encoding: '""'
diff --git a/roles/wsgi_website/molecule/default/tests/test_parameters_optional.py b/roles/wsgi_website/molecule/default/tests/test_parameters_optional.py
index 53ae1561f39ef169f018a20f52d8628674deb583..be962d30b839ba40650ece44ba722e89f1187027 100644
--- a/roles/wsgi_website/molecule/default/tests/test_parameters_optional.py
+++ b/roles/wsgi_website/molecule/default/tests/test_parameters_optional.py
@@ -12,14 +12,7 @@ def test_installed_packages(host):
     Tests if additional packages are installed.
     """
 
-    ansible_facts = host.ansible("setup")["ansible_facts"]
-
-    if ansible_facts['ansible_distribution_release'] == 'jessie':
-        mariadb_compat_package = 'libmariadb-client-lgpl-dev-compat'
-    elif ansible_facts['ansible_distribution_release'] == 'stretch':
-        mariadb_compat_package = 'libmariadbclient-dev-compat'
-
-    assert host.package(mariadb_compat_package).is_installed
+    assert host.package('libmariadbclient-dev-compat').is_installed
     assert host.package('global').is_installed
 
 
diff --git a/roles/wsgi_website/molecule/default/tests/test_parameters_optional_jessie.py b/roles/wsgi_website/molecule/default/tests/test_parameters_optional_jessie.py
deleted file mode 100644
index 4eac8178ce8fdda604a56d6e586e55516a9a51a1..0000000000000000000000000000000000000000
--- a/roles/wsgi_website/molecule/default/tests/test_parameters_optional_jessie.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('jessie')
-
-
-def test_mariadb_compat_symlink(host):
-    """
-    Tests if compatibility symlink is set-up for mysql_config binary if
-    libmariadb-client-lgpl-dev-compat is installed.
-    """
-
-    link = host.file('/usr/bin/mysql_config')
-    assert link.is_symlink
-    assert link.linked_to == "/usr/bin/mariadb_config"
diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index 25cb1591c053f9ecba153133beb85db5bb185a85..1a37a7f4e10d62724357b9b529185cfd0ed813d9 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -116,7 +116,7 @@
 # setuptools is excluded on Stretch, because it would pull-in the
 # pkg-resources package that then messes with pip freeze etc.
 - name: Create Python virtual environment
-  command: '/usr/bin/virtualenv {{ no_setuptools }} --python "{{ python_interpreter }}" --prompt "({{ fqdn }})" "{{ home }}/virtualenv"'
+  command: '/usr/bin/virtualenv --no-setuptools --python "{{ python_interpreter }}" --prompt "({{ fqdn }})" "{{ home }}/virtualenv"'
   args:
     creates: "{{ home }}/virtualenv/bin/{{ python_interpreter | basename }}"
   become: true