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

ec2_vpc_nacl - lint integration tests #2466

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 15, 2025

SUMMARY

Minor ansible-lint issues from the ec2_vpc_nacl integration test

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ec2_vpc_nacl

ADDITIONAL INFORMATION

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/c8ae2848468d4d91b5fc42cadd5c1b4c

✔️ ansible-galaxy-importer SUCCESS in 4m 55s
✔️ build-ansible-collection SUCCESS in 10m 14s
✔️ ansible-test-splitter SUCCESS in 3m 50s
✔️ integration-amazon.aws-1 SUCCESS in 8m 35s
Skipped 43 jobs

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 16, 2025
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 24s
✔️ build-ansible-collection SUCCESS in 10m 21s
✔️ ansible-test-splitter SUCCESS in 3m 52s
Skipped 44 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 0b3a7b8 into ansible-collections:main Jan 16, 2025
50 of 52 checks passed
Copy link

patchback bot commented Jan 16, 2025

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

❌ Failed to cleanly apply 0b3a7b8 on top of patchback/backports/stable-9/0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1/pr-2466

Backporting merged PR #2466 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/amazon.aws.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-9/0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1/pr-2466 upstream/stable-9
  4. Now, cherry-pick PR ec2_vpc_nacl - lint integration tests #2466 contents into that branch:
    $ git cherry-pick -x 0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1
    If it'll yell at you with something like fatal: Commit 0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ec2_vpc_nacl - lint integration tests #2466 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/0b3a7b8e3752cb777afc350a90d4f92a1eb69ef1/pr-2466
  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.

Copy link

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-9 mergeit Merge the PR (SoftwareFactory) skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants