From ecf551f2e806dea4ebe0a778b430408492958047 Mon Sep 17 00:00:00 2001
From: rfan1 <richard.fan@suse.com>
Date: Wed, 2 Nov 2022 08:46:00 +0100
Subject: [PATCH] Add php8 tests for sles15sp5

https://progress.opensuse.org/issues/119530
Ues yaml schedule to load the tests
---
 schedule/qam/common/mau-webserver.yaml |  4 +++-
 tests/console/curl_https.pm            |  2 ++
 tests/console/php_version.pm           | 18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/schedule/qam/common/mau-webserver.yaml b/schedule/qam/common/mau-webserver.yaml
index e87bdc1cb6c9..4232ea8137f2 100644
--- a/schedule/qam/common/mau-webserver.yaml
+++ b/schedule/qam/common/mau-webserver.yaml
@@ -20,7 +20,7 @@ schedule:
   - console/php_postgresql
   - console/php_timezone
   - console/flask
-  - '{{ version_specific }}'
+  - '{{version_specific}}'
 conditional_schedule:
   version_specific:
     VERSION:
@@ -46,6 +46,8 @@ conditional_schedule:
         - console/django
       15-SP4:
         - console/django
+      15-SP5:
+        - console/django
       tumbleweed:
         - console/django
         - console/rails
diff --git a/tests/console/curl_https.pm b/tests/console/curl_https.pm
index b9b90162d972..2200e3df54cc 100644
--- a/tests/console/curl_https.pm
+++ b/tests/console/curl_https.pm
@@ -20,6 +20,7 @@ use warnings;
 use utils qw(clear_console ensure_serialdev_permissions);
 use Utils::Architectures;
 use Utils::Backends;
+use serial_terminal 'select_serial_terminal';
 
 # test for bug https://bugzilla.novell.com/show_bug.cgi?id=598574
 sub run {
@@ -27,6 +28,7 @@ sub run {
     # On s390x platform, make sure that non-root user has
     # permissions for $serialdev to get openQA work properly.
     # Please refer to bsc#1195620
+    select_serial_terminal;    # Switch to root user at first if not
     ensure_serialdev_permissions if (is_s390x);
 
     # Switch to user console: exclude ipmi backends as under non-root user session the $serialdev can not be found
diff --git a/tests/console/php_version.pm b/tests/console/php_version.pm
index a957011ffefe..17cadacaee73 100644
--- a/tests/console/php_version.pm
+++ b/tests/console/php_version.pm
@@ -17,13 +17,29 @@ use testapi;
 use serial_terminal 'select_serial_terminal';
 use apachetest;
 use version_utils qw(is_leap is_sle php_version);
-use registration qw(add_suseconnect_product get_addon_fullname);
+use registration qw(add_suseconnect_product remove_suseconnect_product get_addon_fullname);
 
 sub run {
     select_serial_terminal;
 
     add_suseconnect_product(get_addon_fullname('script'), (is_sle('<15') ? '12' : undef)) if (is_sle('<15-sp4'));
 
+    # On sles15sp5, due to bus#1204824, the package "sle-module-web-scripting-release" is pre-installed,
+    # which tricks SUSEConnect to assume that this module is activated which it isn't, so add below
+    # workaround
+    if (is_sle('=15-SP5')) {
+        if (script_run("suseconnect -l | grep 'Web and Scripting Module'| grep '(Activated)'") == 0) {
+            if (script_run('zypper se php8') == 104) {
+                record_soft_failure 'bsc#1204824 -  php8 packages are not available on sles15sp5';
+                remove_suseconnect_product('sle-module-web-scripting');
+                add_suseconnect_product('sle-module-web-scripting');
+            }
+        }
+        else {
+            add_suseconnect_product('sle-module-web-scripting');
+        }
+    }
+
     my ($php, $php_pkg, $php_ver) = php_version();
 
     setup_apache2(mode => uc('php' . $php_ver));