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

Jump to bottom

use server deploy args #16921

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

use server deploy args #16921

wants to merge 1 commit into from

Conversation

rmynar
Copy link
Contributor

@rmynar rmynar commented Nov 14, 2024

We were wrongly using content host (client) deploy arguments to deploy rhel which acts as a host for server.

@rmynar rmynar requested a review from a team as a code owner November 14, 2024 15:13
@rmynar rmynar added CherryPick PR needs CherryPick to previous branches 6.16.z Introduced in or relating directly to Satellite 6.16 labels Nov 14, 2024
@rmynar
Copy link
Contributor Author

rmynar commented Nov 14, 2024

trigger: test-robottelo
pytest: tests/foreman/installer/test_installer.py -k 'test_satellite_installation or test_capsule_installation'

1 similar comment
@rmynar
Copy link
Contributor Author

rmynar commented Nov 14, 2024

trigger: test-robottelo
pytest: tests/foreman/installer/test_installer.py -k 'test_satellite_installation or test_capsule_installation'

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 9366
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/installer/test_installer.py -k test_satellite_installation or test_capsule_installation --external-logging
Test Result : ========= 2 failed, 22 deselected, 263 warnings in 3998.70s (1:06:38) ==========

@Satellite-QE Satellite-QE added the PRT-Failed Indicates that latest PRT run is failed for the PR label Nov 14, 2024
@jyejare
Copy link
Member

jyejare commented Nov 22, 2024

@rmynar Could you look into the failures ?

@rmynar rmynar marked this pull request as draft November 27, 2024 19:43
@rmynar rmynar force-pushed the fix-pit-srv-deploy branch from f78a6fe to b4e8587 Compare December 2, 2024 14:15
ekohl
ekohl reviewed Dec 2, 2024
View reviewed changes
pytest_fixtures/core/sat_cap_factory.py Outdated
if isinstance(param, list):
return [_remove_raw_keys(item) for item in param]
if isinstance(param, dict):
return {k: (_remove_raw_keys(param[k])) for k in param if not k.startswith("raw_")}
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this a bit easier to read?

Suggested change
return {k: (_remove_raw_keys(param[k])) for k in param if not k.startswith("raw_")}
return {k: _remove_raw_keys(v) for k, v in param.items() if not k.startswith("raw_")}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, looks better. thanks

@rmynar rmynar force-pushed the fix-pit-srv-deploy branch 2 times, most recently from 34610cb to 3a13006 Compare December 2, 2024 17:23
@lhellebr
Copy link
Contributor

trigger: test-robottelo
pytest: tests/foreman/installer/test_installer.py -k 'test_satellite_installation or test_capsule_installation'

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 9698
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/installer/test_installer.py -k test_satellite_installation or test_capsule_installation --external-logging
Test Result : ========= 2 passed, 18 deselected, 206 warnings in 3489.35s (0:58:09) ==========

@Satellite-QE Satellite-QE added PRT-Passed Indicates that latest PRT run is passed for the PR and removed PRT-Failed Indicates that latest PRT run is failed for the PR labels Dec 23, 2024
@rmynar rmynar force-pushed the fix-pit-srv-deploy branch from 3a13006 to 64088f2 Compare January 7, 2025 15:14
@Satellite-QE Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Jan 7, 2025
@jyejare
Copy link
Member

jyejare commented Jan 31, 2025

@rmynar Should this PR be in Draft state still?

@rmynar
Copy link
Contributor Author

rmynar commented Feb 7, 2025

More fixes were needed to fix deployment and installation in Interop testing pipelines. New PR was created #17489 and this one can be closed

jyejare
jyejare reviewed Feb 10, 2025
View reviewed changes
Copy link
Member

@jyejare jyejare left a comment

Choose a reason for hiding this comment

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

A quick sugggestion that may need larger updates.

pytest_fixtures/core/sat_cap_factory.py
@@ -292,10 +301,10 @@ def parametrized_enrolled_sat(
Broker(hosts=[new_sat]).checkin()


def get_deploy_args(request):
"""Get deploy arguments for Satellite base OS deployment. Should not be used for Capsule."""
def get_sat_deploy_args(request):
Copy link
Member

Choose a reason for hiding this comment

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

How if we move these to their own classes in robottelo/hosts.py module as class methods?

Once moved, We/Anywhere these arguments could be used.

pytest_fixtures/core/sat_cap_factory.py
return _remove_raw_keys(deploy_args)


def get_cap_deploy_args():
Copy link
Member

Choose a reason for hiding this comment

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

And this to capsule class as a class method?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekohl ekohl ekohl left review comments

@jyejare jyejare jyejare left review comments

@lpramuk lpramuk lpramuk approved these changes

Assignees

@rmynar rmynar

Labels
6.16.z Introduced in or relating directly to Satellite 6.16 CherryPick PR needs CherryPick to previous branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rmynar @Satellite-QE @jyejare @lhellebr @ekohl @lpramuk