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

Add module_defaults to ec2_networking_resources role #124

Merged
merged 4 commits into from
Nov 22, 2024

Conversation

GomathiselviS
Copy link
Contributor

This PR adds module_defaults to ec2_networking_resources role which is necessary for correctly setting the aws_setup_credentials.

@GomathiselviS GomathiselviS merged commit 829bcf0 into redhat-cop:main Nov 22, 2024
30 of 31 checks passed
@redhat-cop redhat-cop deleted a comment from patchback bot Jan 24, 2025
Copy link

patchback bot commented Jan 24, 2025

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

❌ Failed to cleanly apply 829bcf0 on top of patchback/backports/stable-3/829bcf0b660d780b450696d866ed7e01abd03d80/pr-124

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

abikouo pushed a commit to abikouo/cloud.aws_ops that referenced this pull request Jan 24, 2025
Add module_defaults to ec2_networking_resources role

(cherry picked from commit 829bcf0)
Copy link

patchback bot commented Jan 24, 2025

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

❌ Failed to cleanly apply 829bcf0 on top of patchback/backports/stable-3/829bcf0b660d780b450696d866ed7e01abd03d80/pr-124

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

patchback bot commented Jan 24, 2025

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/829bcf0b660d780b450696d866ed7e01abd03d80/pr-124

Backported as #142

🤖 @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 Jan 24, 2025
Add module_defaults to ec2_networking_resources role

(cherry picked from commit 829bcf0)
abikouo added a commit that referenced this pull request Jan 24, 2025
…829bcf0b660d780b450696d866ed7e01abd03d80/pr-124

[PR #124/829bcf0b backport][stable-3] Add module_defaults to ec2_networking_resources role
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