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

pytest_fixtures/component/hostgroup.py

@@ -10,6 +10,13 @@ def module_hostgroup(module_target_sat):
     return module_target_sat.api.HostGroup().create()
 
 
+@pytest.fixture(scope='module')
+def module_hostgroup_with_org_loc(module_target_sat, module_org, module_location):
+    return module_target_sat.api.HostGroup(
+        organization=[module_org], location=[module_location]
+    ).create()
+
+
 @pytest.fixture(scope='class')
 def class_hostgroup(class_target_sat, class_org, class_location):
     """Create a hostgroup linked to specific org and location created at the class scope"""

pytest_fixtures/component/taxonomy.py

@@ -226,8 +226,7 @@ def sca_manifest_for_upgrade():
 
 
 @pytest.fixture
-def func_future_dated_subscription_manifest(target_sat, function_org):
-    """Create and upload future date subscription manifest into org"""
+def func_future_dated_subscription_manifest():
+    """Returns future dated manifest. Used only for future date subscription scenarios."""
     with Manifester(manifest_category=settings.manifest.future_date_subscription) as manifest:
-        target_sat.upload_manifest(function_org.id, manifest.content)
-    return manifest
+        yield manifest

pytest_fixtures/component/user_role.py

@@ -1,7 +1,31 @@
-from fauxfactory import gen_alphanumeric, gen_string
+from fauxfactory import gen_alphanumeric
 import pytest
 
 
+class UserFactory:
+    """Helper class for more complex operations with users that can be reused in fixtures."""
+
+    @staticmethod
+    def create_user(target_sat, **params):
+        """Create and return a user object. Set the password if not specified.
+        Args:
+            target_sat: Satellite object
+            params: parameters passed to the User object
+        Returns:
+             User object
+        """
+        params.setdefault('password', gen_alphanumeric())
+        user = target_sat.api.User(**params).create()
+        user.password = params['password']
+        return user
+
+
+@pytest.fixture(scope='session')
+def viewer_role(session_target_sat):
+    """Viewer role."""
+    return session_target_sat.api.Role().search(query={'search': 'name="Viewer"'})[0]
+
+
 @pytest.fixture(scope='class')
 def class_user_password():
     """Generate a random password for a user, and capture it so a test has access to it"""
@@ -26,19 +50,27 @@ def module_user(module_target_sat, module_org, module_location):
 
 
 @pytest.fixture(scope='module')
-def default_viewer_role(module_target_sat, module_org, default_location):
+def default_viewer_role(module_target_sat, module_org, default_location, viewer_role):
     """Custom user with viewer role for tests validating visibility of entities or fields created
     by some other user. Created only when accessed, unlike `module_user`.
     """
-    viewer_role = module_target_sat.api.Role().search(query={'search': 'name="Viewer"'})[0]
-    custom_password = gen_string('alphanumeric')
-    custom_user = module_target_sat.api.User(
+    return UserFactory.create_user(
+        target_sat=module_target_sat,
         admin=False,
         default_organization=module_org,
         location=[default_location],
         organization=[module_org],
         role=[viewer_role],
-        password=custom_password,
-    ).create()
-    custom_user.password = custom_password
-    return custom_user
+    )
+
+
+@pytest.fixture(scope='module')
+def module_user_viewer(module_target_sat, module_org, module_location, viewer_role):
+    """Non-admin user with Viewer role."""
+    return UserFactory.create_user(
+        target_sat=module_target_sat,
+        admin=False,
+        location=[module_location],
+        organization=[module_org],
+        role=[viewer_role],
+    )

requirements-optional.txt

@@ -1,6 +1,6 @@
 # For running tests and checking code quality using these modules.
 pytest-cov==7.0.0
-redis==7.2.0
+redis==7.2.1
 pre-commit==4.5.1
 ruff==0.15.2
 

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',

robottelo/content_info.py

@@ -69,6 +69,27 @@ def get_repo_files_by_url(url, extension='rpm'):
     return sorted([os.path.basename(f) for f in get_repo_files_urls_by_url(url, extension)])
 
 
+def get_baseurl_by_repofile(repo_url, verify_ssl=True):
+    """
+    Returns the baseurl from a remote yum .repo file.
+
+    :param repo_url: URL to the .repo file
+    :return: baseurl string
+    :raises requests.HTTPError: if URL not accessible
+    :raises ValueError: if baseurl not found
+    """
+    response = requests.get(repo_url, verify=verify_ssl, timeout=10)
+    response.raise_for_status()
+
+    for line in response.text.splitlines():
+        line = line.strip()
+
+        if line.startswith('baseurl='):
+            return line.split('=', 1)[1].strip()
+
+    raise ValueError(f'No baseurl found in {repo_url}')
+
+
 def get_repomd(repo_url):
     """Fetches content of the repomd file of a repository
 

tests/foreman/api/test_convert2rhel.py

@@ -19,6 +19,7 @@
 
 from robottelo.config import settings
 from robottelo.constants import DEFAULT_ARCHITECTURE, REPOS
+from robottelo.content_info import get_baseurl_by_repofile
 from robottelo.utils.issue_handlers import is_open
 
 
@@ -134,7 +135,8 @@ def centos(
 
     centos_host.enable_ipv6_dnf_proxy()
     assert centos_host.execute('yum -y update').status == 0
-    repo_url = settings.repos.convert2rhel.convert_to_rhel_repo.format(major)
+    repofile_url = settings.repos.convert2rhel.convert_to_rhel_repofile.format(major)
+    repo_url = get_baseurl_by_repofile(repofile_url)
     repo = create_repo(module_target_sat, module_els_sca_manifest_org, repo_url)
     cv = update_cv(
         module_target_sat, module_promoted_cv, module_lce, enable_rhel_subscriptions + [repo]
@@ -229,7 +231,8 @@ def oracle(
     if oracle_host.execute('needs-restarting -r').status == 1:
         oracle_host.power_control(state='reboot')
 
-    repo_url = settings.repos.convert2rhel.convert_to_rhel_repo.format(major)
+    repofile_url = settings.repos.convert2rhel.convert_to_rhel_repofile.format(major)
+    repo_url = get_baseurl_by_repofile(repofile_url)
     repo = create_repo(module_target_sat, module_els_sca_manifest_org, repo_url, ssl_cert)
     cv = update_cv(
         module_target_sat, module_promoted_cv, module_lce, enable_rhel_subscriptions + [repo]

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):