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

Update manifest fixture in registration test to resolve conflict #13616

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Update manifest fixture in registration test to resolve conflict #13616

merged 1 commit into from
Jan 8, 2024

Conversation

shweta83
Copy link
Contributor

@shweta83 shweta83 commented Jan 5, 2024

Problem Statement

There was a conflict in manifest fixture as both sca and non-sca enabled fixture was being used in same test case.

Solution

Updated the test case to fix the test failures.

Related Issues

@shweta83 shweta83 requested a review from a team as a code owner January 5, 2024 03:49
@shweta83 shweta83 self-assigned this Jan 5, 2024
@shweta83 shweta83 added CherryPick PR needs CherryPick to previous branches 6.12.z Introduced in or relating directly to Satellite 6.12 AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 labels Jan 5, 2024
@shweta83
Copy link
Contributor Author

shweta83 commented Jan 5, 2024

trigger: test-robottelo
pytest: tests/foreman/cli/test_registration.py -k 'test_host_registration_end_to_end'

@shweta83 shweta83 force-pushed the update_manifest_fixture branch from 91aded4 to e724411 Compare January 8, 2024 05:39
@shweta83 shweta83 force-pushed the update_manifest_fixture branch from e724411 to 598a93c Compare January 8, 2024 05:39
@shweta83
Copy link
Contributor Author

shweta83 commented Jan 8, 2024

trigger: test-robottelo
pytest: tests/foreman/cli/test_registration.py -k 'test_host_registration_end_to_end'

@shweta83
Copy link
Contributor Author

shweta83 commented Jan 8, 2024

1 test for rhel6 failed because of known issue. I will re-run the test case for only one rhel version.

@shweta83
Copy link
Contributor Author

shweta83 commented Jan 8, 2024

trigger: test-robottelo
pytest: tests/foreman/cli/test_registration.py -k 'test_host_registration_end_to_end[rhel8]'

@shweta83
Copy link
Contributor Author

shweta83 commented Jan 8, 2024

trigger: test-robottelo
pytest: tests/foreman/api/test_registration.py -k 'test_host_registration_end_to_end[rhel8]'

@Gauravtalreja1
Copy link
Collaborator

@shweta83 Do we really need this for 6.14.z and below? iirc this test passes for this versions, if not, could you remove this labels for cherrypick?

@shweta83
Copy link
Contributor Author

shweta83 commented Jan 8, 2024

@shweta83 Do we really need this for 6.14.z and below? iirc this test passes for this versions, if not, could you remove this labels for cherrypick?

Yes not needed for older versions.

@shweta83 shweta83 removed 6.12.z Introduced in or relating directly to Satellite 6.12 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 labels Jan 8, 2024
@Gauravtalreja1 Gauravtalreja1 merged commit fb3453a into SatelliteQE:master Jan 8, 2024
9 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 8, 2024
@shweta83 @web-flow
Update manifest fixture in registration test to resolve conflict (#13616
0da2a3a 
)

Update manifest fixture in test

(cherry picked from commit fb3453a)
@Satellite-QE Satellite-QE mentioned this pull request Jan 8, 2024
Merged
shweta83 added a commit to shweta83/robottelo that referenced this pull request Apr 10, 2024
@shweta83
Update manifest fixture in registration test to resolve conflict (Sat…
0a3049a 
…elliteQE#13616)

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

@Gauravtalreja1 Gauravtalreja1 Gauravtalreja1 approved these changes

Assignees

@shweta83 shweta83

Labels
6.15.z Introduced in or relating directly to Satellite 6.15 AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing CherryPick PR needs CherryPick to previous branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shweta83 @Gauravtalreja1