diff --git a/roles/wsgi_website/defaults/main.yml b/roles/wsgi_website/defaults/main.yml index acbf809d68295492cb1eb50e6529f12e9cd543c2..bb29a9a954ea8c27395d90f31008202437698c3f 100644 --- a/roles/wsgi_website/defaults/main.yml +++ b/roles/wsgi_website/defaults/main.yml @@ -22,4 +22,4 @@ user: "web-{{ fqdn | replace('.', '_') }}" home: "/var/www/{{ fqdn }}" python_interpreter: "/usr/bin/python3" pip_check_requirements_upgrades_directory: "/etc/pip_check_requirements_upgrades" -virtualenv_prompt: "{% if ansible_distribution_release == 'bullseye' %}({{ fqdn }}) {% else %}{{ fqdn }}{% endif %}" +virtualenv_prompt: "{{ fqdn }}" diff --git a/roles/wsgi_website/molecule/default/molecule.yml b/roles/wsgi_website/molecule/default/molecule.yml index b3d7e93d618c9f64c05271731289423b353e52cb..67f0705922c7256deb33940a3ad8f416d19937b8 100644 --- a/roles/wsgi_website/molecule/default/molecule.yml +++ b/roles/wsgi_website/molecule/default/molecule.yml @@ -14,17 +14,6 @@ lint: platforms: - - name: wsgi-website-bullseye - groups: - - wsgi-website - - parameters-mandatory - - parameters-optional - box: debian/bullseye64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - - name: wsgi-website-bookworm groups: - wsgi-website diff --git a/roles/wsgi_website/molecule/default/tests/conftest.py b/roles/wsgi_website/molecule/default/tests/conftest.py index ac2560bbec6fb3fc772eed682502d36f500cc589..41db22ec2b7dbc051bdfdc6ea2acea81e1a9cdd1 100644 --- a/roles/wsgi_website/molecule/default/tests/conftest.py +++ b/roles/wsgi_website/molecule/default/tests/conftest.py @@ -11,7 +11,6 @@ def python_info(host): Currently supports: - - Debian 11 (Bullseye) - Debian 12 (Bookworm) Resulting information can be accessed through returned named tuple @@ -25,9 +24,7 @@ def python_info(host): ansible_facts = host.ansible("setup")["ansible_facts"] ansible_distribution_release = ansible_facts['ansible_distribution_release'] - if ansible_distribution_release == 'bullseye': - info = PythonInfo(python_version="3.9.2") - elif ansible_distribution_release == 'bookworm': + if ansible_distribution_release == 'bookworm': info = PythonInfo(python_version="3.11.2") else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)