Merge branch '6.19.z' into cherry-pick-6.19.z-b63db29008c99e58249bccc22cd2b912c3d356a5

Author: synkd

conf/container.yaml.template

@@ -4,7 +4,7 @@ CONTAINER:
     - docker
     - podman
   REGISTRY_HUB: https://mirror.gcr.io
-  UPSTREAM_NAME: 'library/busybox'
+  UPSTREAM_NAME: jmalloc/echo-server
   ALTERNATIVE_UPSTREAM_NAMES:
     - hello-world
     - alpine

robottelo/config/validators.py

@@ -119,7 +119,7 @@
             'container.upstream_name',
             must_exist=True,
             is_type_of=str,
-            default='library/busybox',
+            default='jmalloc/echo-server',
         ),
         Validator(
             'container.alternative_upstream_names',

tests/foreman/cli/test_container_management.py

@@ -11,6 +11,7 @@
 """
 
 from datetime import UTC, datetime
+import re
 
 from box import Box
 from fauxfactory import gen_string
@@ -94,16 +95,18 @@ def test_positive_pull_image(
             )
             assert result.status == 0
             try:
-                result = module_container_contenthost.execute(f'docker run {repo["published-at"]}')
+                result = module_container_contenthost.execute(
+                    f'docker run -d {repo["published-at"]}'
+                )
                 assert result.status == 0
+                match = re.match(r'^[0-9a-f]+$', result.stdout)
+                if match:
+                    container_id = match.group(0)
             finally:
                 # Stop and remove the container
-                result = module_container_contenthost.execute(
-                    f'docker ps -a | grep {repo["published-at"]}'
-                )
-                container_id = result.stdout[0].split()[0]
-                module_container_contenthost.execute(f'docker stop {container_id}')
-                module_container_contenthost.execute(f'docker rm {container_id}')
+                if container_id:
+                    module_container_contenthost.execute(f'docker stop {container_id}')
+                    module_container_contenthost.execute(f'docker rm {container_id}')
         finally:
             # Remove docker image
             module_container_contenthost.execute(f'docker rmi {repo["published-at"]}')

tests/foreman/destructive/test_ldap_authentication.py

@@ -266,14 +266,8 @@ def test_single_sign_on_ldap_ad_server(
     assert f'{url}/new/hosts' in result.stdout
 
 
-@pytest.mark.parametrize(
-    'setting_update',
-    [f'login_delegation_logout_url={LOGIN_DELEGATION_LOGOUT_URL}'],
-    ids=["external_redirect"],
-    indirect=True,
-)
 def test_single_sign_on_using_rhsso(
-    enable_external_auth_rhsso, rhsso_setting_setup, module_target_sat, setting_update
+    enable_external_auth_rhsso, rhsso_setting_setup, module_target_sat
 ):
     """Verify the single sign-on functionality with external authentication RH-SSO
 
@@ -299,11 +293,23 @@ def test_single_sign_on_using_rhsso(
         actual_user = session.task.read_all(widget_names="current_user")['current_user']
         assert settings.rhsso.rhsso_user in actual_user
         # logout verification for SAT-40322
-        session.rhsso_login.logout()
-        assert session.browser.url == LOGIN_DELEGATION_LOGOUT_URL, "Unsuccessful logout redirect"
-        with pytest.raises(NavigationTriesExceeded) as error:
-            session.task.read_all(widget_names='current_user')['current_user']
-        assert error.typename == 'NavigationTriesExceeded'
+        setting_object = module_target_sat.api.Setting().search(
+            query={'search': 'name=login_delegation_logout_url'}
+        )[0]
+        default_setting_value = '' if setting_object.value is None else setting_object.value
+        setting_object.value = LOGIN_DELEGATION_LOGOUT_URL
+        setting_object.update({'value'})
+        try:
+            session.rhsso_login.logout()
+            assert session.browser.url == LOGIN_DELEGATION_LOGOUT_URL, (
+                "Unsuccessful logout redirect"
+            )
+            with pytest.raises(NavigationTriesExceeded) as error:
+                session.task.read_all(widget_names='current_user')['current_user']
+            assert error.typename == 'NavigationTriesExceeded'
+        finally:
+            setting_object.value = default_setting_value
+            setting_object.update({'value'})
 
 
 def test_external_logout_rhsso(rhsso_setting_setup, enable_external_auth_rhsso, module_target_sat):

tests/foreman/sys/test_mcp.py

@@ -2,11 +2,11 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: API
+:CaseComponent: MCP
 
 :Team: Endeavour
 
-:Requirement: API
+:Requirement: MCP
 
 :CaseImportance: High
 
@@ -158,6 +158,11 @@ async def test_positive_mcp_user_view_permissions(
         result = await client.call_tool(
             'call_foreman_api_get', {'resource': allowed_resource, 'action': 'index', 'params': {}}
         )
+        if 'error' in result.data and 'Max retries exceeded' in result.data['error']:
+            result = await client.call_tool(
+                'call_foreman_api_get',
+                {'resource': allowed_resource, 'action': 'index', 'params': {}},
+            )
         assert (
             result.data['message']
             == f"Action 'index' on resource '{allowed_resource}' executed successfully."
@@ -170,3 +175,4 @@ async def test_positive_mcp_user_view_permissions(
             f"Failed to execute action 'index' on resource '{denied_resource}'"
             in result.data['message']
         )
+        assert result.data['response']['error']['message'] == 'Access denied'