Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark one RHSSO test for PIT server #17204

Merged
merged 1 commit into from
Jan 13, 2025
+3 −1
Merged

Mark one RHSSO test for PIT server #17204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pytest_fixtures/component/satellite_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@ def auth_data(request, ad_data, ipa_data):
@pytest.fixture(scope='module')
def enroll_configure_rhsso_external_auth(module_target_sat):
"""Enroll the Satellite6 Server to an RHSSO Server."""
module_target_sat.register_to_cdn()
if settings.robottelo.rhel_source == "ga":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't seen this in robottelo.yaml in Jenkins (though it's present in robottelo.yaml.template).
Do I assume correctly that we depend purely on the validator here?

Maybe rather question for @rmynar.

Copy link
Collaborator

@Gauravtalreja1 Gauravtalreja1 Jan 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can try available setting settings.robottelo.cdn == true here? Or add missing setting in robottelo.yaml
CC @rmynar

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not say we have to "depend" on validators. But the idea is to maintain validators responsibly (not only in this case) so we can "trust" them.
Relying on default values and modifying the settings only in specific cases seems OK to me. (The rhel_source setting has to be explicitly changed to "internal" usually for interoperability testing - i.e. testing with unreleased RHEL version)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The setting is set in the .template config

robottelo/conf/robottelo.yaml.template

Lines 25 to 27 in b7406c0

# The source of RHEL packages. Can be one of:
# internal, ga (CDN)
RHEL_SOURCE: "ga"
.

And yes, in this case, we rely on Dynaconf validators to populate the setting for us, but since validators run unconditionally every time (now even in Robottelo CI/CQ), I share the same view as @rmynar. However, there is no harm in adding an explicit setting in the YAML config. Anyone, feel free to submit a patch.

module_target_sat.register_to_cdn()
# keycloak-httpd-client-install needs lxml but it's not an rpm dependency + is not documented
assert (
module_target_sat.execute(
Expand Down
1 change: 1 addition & 0 deletions tests/foreman/destructive/test_ldapauthsource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def rh_sso_hammer_auth_setup(module_target_sat, default_sso_host, request):
default_sso_host.update_client_configuration(client_config)


@pytest.mark.pit_server
def test_rhsso_login_using_hammer(
module_target_sat,
enable_external_auth_rhsso,
Expand Down
Loading