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.

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

[6.12.z] component name changes #14391

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Conversation

pondrejk
Copy link
Contributor

Problem Statement

manual cherry-pick of #14380
closes #14390

@pondrejk pondrejk added No-CherryPick PR doesnt need CherryPick to previous branches 6.12.z Introduced in or relating directly to Satellite 6.12 labels Mar 13, 2024
@pondrejk pondrejk self-assigned this Mar 13, 2024
@Gauravtalreja1
Copy link
Collaborator

@pondrejk :CaseLevel: is still required for 6.12.z as removal PR of caselevel or other tokens wasn't cherrypicked to 6.12.z (CC @omkarkhatavkar @jyejare ), but meanwhile could you add that back so we can get this PR merged?

testimony --config testimony.yaml validate tests/foreman/api
tests/foreman/api/test_ldapauthsource.py
========================================

test_positive_endtoend:27
-------------------------

* Docstring should have at least caseautomation, casecomponent, caseimportance, caselevel, id, requirement, team, testtype, upstream token(s)

@jyejare
Copy link
Member

jyejare commented Mar 14, 2024

Good find @Gauravtalreja1 through checks ! @omkarkhatavkar could we cherrypick this now even before we merge this PR ?

@omkarkhatavkar
Copy link

Good find @Gauravtalreja1 through checks ! @omkarkhatavkar could we cherrypick this now even before we merge this PR ?

@jyejare @Gauravtalreja1 I just added that back to 6.12.z. Some how I missed that, now you can see that #14414

@Gauravtalreja1
Copy link
Collaborator

@omkarkhatavkar @jyejare Thank you for taking the prompt action by cherrypicking the huge and long pending PR.
@pondrejk will now need to resolve the conflicts in his branch, I wish we would've merged this PR as is first :)

@omkarkhatavkar
Copy link

It was painful for me, it took 2 hours

@jyejare
Copy link
Member

jyejare commented Mar 15, 2024

@pondrejk please resolve the conflicts !

@pondrejk pondrejk merged commit 0d6be10 into SatelliteQE:6.12.z Mar 15, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.12.z Introduced in or relating directly to Satellite 6.12 No-CherryPick PR doesnt need CherryPick to previous branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants