Skip to content

Conversation

@yurnov
Copy link
Contributor

@yurnov yurnov commented Apr 23, 2025

SUMMARY

CI fix for #904

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

tests/unit

ADDITIONAL INFORMATION

@softwarefactory-project-zuul
Copy link

@sivel
Copy link

sivel commented Apr 23, 2025

The units are failing to compare warnings[0] since the internal definition of what is stored in the warnings list is no longer a simple string, it's a serialization of an internal type. At a minimum using str(warnings[0]) may allow the comparison to work in 2.19 and before, as it will repr the dict for the string in comparison.

- assert "kubernetes" in warnings[0]
+ assert "kubernetes" in str(warnings[0])

@softwarefactory-project-zuul
Copy link

@softwarefactory-project-zuul
Copy link

@softwarefactory-project-zuul
Copy link

@yurnov yurnov changed the title [DNM] empty PR to trigger CI for test Bugfix: fix unit-source for pre-release of ansible-core 2.20 (devel and milestone branch) Apr 24, 2025
@yurnov
Copy link
Contributor Author

yurnov commented Apr 24, 2025

The units are failing to compare warnings[0] since the internal definition of what is stored in the warnings list is no longer a simple string, it's a serialization of an internal type. At a minimum using str(warnings[0]) may allow the comparison to work in 2.19 and before, as it will repr the dict for the string in comparison.

- assert "kubernetes" in warnings[0]
+ assert "kubernetes" in str(warnings[0])

Thanks a lot for your support

@softwarefactory-project-zuul
Copy link

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/cba13e8844bf488e87f632f054415dc4

✔️ ansible-galaxy-importer SUCCESS in 3m 16s
✔️ build-ansible-collection SUCCESS in 5m 28s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit d4fc22c into ansible-collections:main Apr 24, 2025
39 checks passed
@yurnov
Copy link
Contributor Author

yurnov commented Apr 24, 2025

@gravesm, probably it's worth backporting this PR to stable-5 and stable-3

@patchback
Copy link

patchback bot commented Apr 25, 2025

Backport to stable-3: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d4fc22c on top of patchback/backports/stable-3/d4fc22c74e9c90ecfc4313166fb678734b794244/pr-903

Backporting merged PR #903 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/kubernetes.core.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-3/d4fc22c74e9c90ecfc4313166fb678734b794244/pr-903 upstream/stable-3
  4. Now, cherry-pick PR Bugfix: fix unit-source for pre-release of ansible-core 2.20 (devel and milestone branch) #903 contents into that branch:
    $ git cherry-pick -x d4fc22c74e9c90ecfc4313166fb678734b794244
    If it'll yell at you with something like fatal: Commit d4fc22c74e9c90ecfc4313166fb678734b794244 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d4fc22c74e9c90ecfc4313166fb678734b794244
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bugfix: fix unit-source for pre-release of ansible-core 2.20 (devel and milestone branch) #903 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/d4fc22c74e9c90ecfc4313166fb678734b794244/pr-903
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link

patchback bot commented Apr 25, 2025

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/d4fc22c74e9c90ecfc4313166fb678734b794244/pr-903

Backported as #909

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Apr 25, 2025
…nd milestone branch) (#903)

SUMMARY
CI fix for #904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Bianca Henderson <[email protected]>
(cherry picked from commit d4fc22c)
yurnov added a commit to yurnov/kubernetes.core that referenced this pull request Apr 25, 2025
Bugfix: fix unit-source for pre-release of ansible-core 2.20 (devel and milestone branch) (ansible-collections#903)

SUMMARY
CI fix for ansible-collections#904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Bianca Henderson <[email protected]>
beeankha pushed a commit to beeankha/kubernetes.core that referenced this pull request Apr 25, 2025
…nd milestone branch) (ansible-collections#903)

SUMMARY
CI fix for ansible-collections#904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Bianca Henderson <[email protected]>
(cherry picked from commit d4fc22c)
beeankha pushed a commit to beeankha/kubernetes.core that referenced this pull request Apr 25, 2025
…nd milestone branch) (ansible-collections#903)

SUMMARY
CI fix for ansible-collections#904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Bianca Henderson <[email protected]>
(cherry picked from commit d4fc22c)
beeankha pushed a commit that referenced this pull request Apr 25, 2025
…nd milestone branch) (#903) (#909)

SUMMARY
CI fix for #904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Bianca Henderson <[email protected]>
(cherry picked from commit d4fc22c)

Co-authored-by: Yuriy Novostavskiy <[email protected]>
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 25, 2025
…nd milestone branch) (#903) (#911)

This is a backport of PR #903 as merged into main (d4fc22c).
SUMMARY
CI fix for #904
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/unit
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants