From ffcd5d901d56f453985b6504790f15c5c258f983 Mon Sep 17 00:00:00 2001 From: iamluc Date: Wed, 20 Nov 2024 17:23:45 +0100 Subject: [PATCH] Enable more PHP docker-ssi tests --- tests/docker_ssi/test_docker_ssi.py | 1 - utils/docker_ssi/docker_ssi_definitions.py | 25 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/docker_ssi/test_docker_ssi.py b/tests/docker_ssi/test_docker_ssi.py index ff93013ce38..36b44021b91 100644 --- a/tests/docker_ssi/test_docker_ssi.py +++ b/tests/docker_ssi/test_docker_ssi.py @@ -92,7 +92,6 @@ def test_telemetry(self): @features.ssi_guardrails @irrelevant(context.library == "java" and context.installed_language_runtime >= "1.8.0_0") - @bug(condition=context.library == "php" and context.installed_language_runtime < "7.0", reason="INPLAT-180") @irrelevant(context.library == "php" and context.installed_language_runtime >= "7.0") @bug(condition=context.library == "python" and context.installed_language_runtime < "3.7.0", reason="INPLAT-181") @irrelevant(context.library == "python" and context.installed_language_runtime >= "3.7.0") diff --git a/utils/docker_ssi/docker_ssi_definitions.py b/utils/docker_ssi/docker_ssi_definitions.py index 1eb5b864ab2..3a8354f3d68 100644 --- a/utils/docker_ssi/docker_ssi_definitions.py +++ b/utils/docker_ssi/docker_ssi_definitions.py @@ -66,15 +66,31 @@ class PHPRuntimeInstallableVersions: """ PHP runtime versions that can be installed automatically""" PHP56 = RuntimeInstallableVersion("PHP56", "5.6") # Not supported (EOL runtime) + PHP70 = RuntimeInstallableVersion("PHP70", "7.0") + PHP71 = RuntimeInstallableVersion("PHP71", "7.1") + PHP72 = RuntimeInstallableVersion("PHP72", "7.2") + PHP73 = RuntimeInstallableVersion("PHP73", "7.3") PHP74 = RuntimeInstallableVersion("PHP74", "7.4") + PHP80 = RuntimeInstallableVersion("PHP80", "8.0") + PHP81 = RuntimeInstallableVersion("PHP81", "8.1") + PHP82 = RuntimeInstallableVersion("PHP82", "8.2") PHP83 = RuntimeInstallableVersion("PHP83", "8.3") + PHP84 = RuntimeInstallableVersion("PHP84", "8.4") @staticmethod def get_all_versions(): return [ PHPRuntimeInstallableVersions.PHP56, + PHPRuntimeInstallableVersions.PHP70, + PHPRuntimeInstallableVersions.PHP71, + PHPRuntimeInstallableVersions.PHP72, + PHPRuntimeInstallableVersions.PHP73, PHPRuntimeInstallableVersions.PHP74, + PHPRuntimeInstallableVersions.PHP80, + PHPRuntimeInstallableVersions.PHP81, + PHPRuntimeInstallableVersions.PHP82, PHPRuntimeInstallableVersions.PHP83, + PHPRuntimeInstallableVersions.PHP84, ] @staticmethod @@ -174,7 +190,14 @@ def get_version_id(version): PHP_APP = WeblogDescriptor( "php-app", "php", - [SupportedImages().UBUNTU_22_AMD64.with_allowed_runtime_versions(PHPRuntimeInstallableVersions.get_all_versions())], + [ + SupportedImages().UBUNTU_22_AMD64.with_allowed_runtime_versions( + PHPRuntimeInstallableVersions.get_all_versions() + ), + SupportedImages().UBUNTU_22_ARM64.with_allowed_runtime_versions( + PHPRuntimeInstallableVersions.get_all_versions() + ), + ], ) PY_APP = WeblogDescriptor(