73e3a943d0
- Resolves: RHEL-78766 Include latest fixes in python3-ipatests package - Resolves: RHEL-77965 ipa-server-install failing on slow hsm Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
From d0dd2e8393f4b49edc67f8036a19d8b2d4e28938 Mon Sep 17 00:00:00 2001
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
|
Date: Fri, 31 Jan 2025 13:09:22 +0100
|
|
Subject: [PATCH] ipatests: on rhel10 do not install firefox
|
|
|
|
Firefox will be installed as a pre-requisite as it either comes
|
|
as a flatpak or a tar file. The flatpak is not compatible with
|
|
geckodriver as explained in geckodriver release notes
|
|
(https://github.com/mozilla/geckodriver/releases/tag/v0.35.0)
|
|
|
|
Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
|
|
---
|
|
ipatests/pytest_ipa/integration/create_keycloak.py | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ipatests/pytest_ipa/integration/create_keycloak.py b/ipatests/pytest_ipa/integration/create_keycloak.py
|
|
index addade7594d7a1b8edefdb8c67ec4bc7abe70ef4..7f0850ca704b3d4c9748a8e46cad1fff7c31f112 100644
|
|
--- a/ipatests/pytest_ipa/integration/create_keycloak.py
|
|
+++ b/ipatests/pytest_ipa/integration/create_keycloak.py
|
|
@@ -9,9 +9,13 @@ from ipatests.pytest_ipa.integration import tasks
|
|
def setup_keycloakserver(host, version='26.1.0'):
|
|
dir = "/opt/keycloak"
|
|
password = host.config.admin_password
|
|
- tasks.install_packages(host, ["unzip", "java-21-openjdk-headless",
|
|
- "openssl", "maven", "wget",
|
|
- "firefox", "xorg-x11-server-Xvfb"])
|
|
+ packages = ["unzip", "java-21-openjdk-headless", "openssl", "maven", "wget"]
|
|
+ # For RHEL 10 we don't install firefox as it is not shipped any more
|
|
+ # as a rpm. The infra handles the installation from a zip file
|
|
+ if not (tasks.get_platform(host) == "rhel"
|
|
+ and tasks.get_platform_version(host)[0] == 10):
|
|
+ packages.extend(["firefox", "xorg-x11-server-Xvfb"])
|
|
+ tasks.install_packages(host, packages)
|
|
# add keycloak system user/group and folder
|
|
url = "https://github.com/keycloak/keycloak/releases/download/{0}/keycloak-{0}.zip".format(version) # noqa: E501
|
|
host.run_command(["wget", url, "-O", "{0}-{1}.zip".format(dir, version)])
|
|
--
|
|
2.48.1
|
|
|