From 00b76acdecc7f347be97e4004e2653ee8c86edff 2024-08-30 17:03:29
From: Branko Majic <branko@majic.rs>
Date: 2024-08-30 17:03:29
Subject: [PATCH] MAR-239: Dropped support for Debian 11 Bullseye from the php_website role.

---

diff --git a/roles/php_website/defaults/main.yml b/roles/php_website/defaults/main.yml
index 1f8c5b4f17b2dbac5bc93cb8337622e7d0e55daf..037dd730efa3edd323bcc79e3b2c50d896978003 100644
--- a/roles/php_website/defaults/main.yml
+++ b/roles/php_website/defaults/main.yml
@@ -14,15 +14,12 @@ http_header_overrides: {}
 
 # Internal parameters.
 php_fpm_service_name_per_release:
-  bullseye: "php7.4-fpm"
   bookworm: "php8.2-fpm"
 
 php_fpm_binary_per_release:
-  bullseye: "php-fpm7.4"
   bookworm: "php-fpm8.2"
 
 php_fpm_pool_directory_per_release:
-  bullseye: "/etc/php/7.4/fpm/pool.d"
   bookworm: "/etc/php/8.2/fpm/pool.d"
 
 admin: "admin-{{ fqdn | replace('.', '_') }}"
diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml
index 19280a24bfcd55ca7f3c545367721db76df479b5..9a296cba7dd73b27862f6c1a54a423cc611c3a98 100644
--- a/roles/php_website/molecule/default/molecule.yml
+++ b/roles/php_website/molecule/default/molecule.yml
@@ -14,16 +14,6 @@ lint:
 
 platforms:
 
-  - name: php-website-bullseye
-    groups:
-      - parameters-mandatory
-      - parameters-optional
-    box: debian/bullseye64
-    memory: 512
-    cpus: 1
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-
   - name: php-website-bookworm
     groups:
       - parameters-mandatory
diff --git a/roles/php_website/molecule/default/tests/conftest.py b/roles/php_website/molecule/default/tests/conftest.py
index f9c832b15a2dc1d2217188eb28942305a580bc59..b52cc0fd8bd994fa139bf03acc8b279be6e39014 100644
--- a/roles/php_website/molecule/default/tests/conftest.py
+++ b/roles/php_website/molecule/default/tests/conftest.py
@@ -11,7 +11,6 @@ def php_info(host):
 
     Currently supports:
 
-    - Debian 11 (Bullseye)
     - Debian 12 (Bookworm)
 
     Resulting information can be accessed through returned named tuple
@@ -28,9 +27,7 @@ def php_info(host):
     ansible_facts = host.ansible("setup")["ansible_facts"]
     ansible_distribution_release = ansible_facts['ansible_distribution_release']
 
-    if ansible_distribution_release == 'bullseye':
-        info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.4-fpm', fpm_pool_dir='/etc/php/7.4/fpm/pool.d', base_config_dir='/etc/php/7.4')
-    elif ansible_distribution_release == 'bookworm':
+    if ansible_distribution_release == 'bookworm':
         info = PHPInfo(fpm_package='php-fpm', fpm_service='php8.2-fpm', fpm_pool_dir='/etc/php/8.2/fpm/pool.d', base_config_dir='/etc/php/8.2')
     else:
         raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)