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

Inventory plugins do not convert template parameters #1980

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Feb 20, 2024

SUMMARY

Fixes #1955

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

Inventory plugin

@abikouo abikouo force-pushed the inventory_templar_20240207 branch from 4497465 to 5294192 Compare February 20, 2024 10:44
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/ff2f7a63fd374f968b4a0dad5df62056

✔️ ansible-galaxy-importer SUCCESS in 5m 31s
✔️ build-ansible-collection SUCCESS in 15m 08s
✔️ ansible-test-splitter SUCCESS in 5m 33s
integration-amazon.aws-1 RETRY_LIMIT in 6m 57s
Skipped 43 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Feb 20, 2024

recheck

Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 21s
✔️ build-ansible-collection SUCCESS in 14m 17s
✔️ ansible-test-splitter SUCCESS in 5m 37s
✔️ integration-amazon.aws-1 SUCCESS in 16m 57s
Skipped 43 jobs

@abikouo abikouo force-pushed the inventory_templar_20240207 branch from 5294192 to 9d7315f Compare February 23, 2024 06:09
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 45s
✔️ build-ansible-collection SUCCESS in 14m 41s
✔️ ansible-test-splitter SUCCESS in 5m 25s
✔️ integration-amazon.aws-1 SUCCESS in 17m 41s
Skipped 43 jobs

@tremble tremble force-pushed the inventory_templar_20240207 branch from 9d7315f to f3a3e11 Compare February 28, 2024 08:08
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 56s
✔️ build-ansible-collection SUCCESS in 15m 19s
✔️ ansible-test-splitter SUCCESS in 6m 18s
✔️ integration-amazon.aws-1 SUCCESS in 21m 01s
Skipped 43 jobs

@abikouo abikouo force-pushed the inventory_templar_20240207 branch from f3a3e11 to cdd7680 Compare March 4, 2024 16:00
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 10s
✔️ build-ansible-collection SUCCESS in 14m 46s
✔️ ansible-test-splitter SUCCESS in 6m 17s
✔️ integration-amazon.aws-1 SUCCESS in 20m 53s
Skipped 43 jobs

@abikouo abikouo added the mergeit Merge the PR (SoftwareFactory) label Mar 4, 2024
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 37s
✔️ build-ansible-collection SUCCESS in 14m 58s
✔️ ansible-test-splitter SUCCESS in 6m 43s
✔️ integration-amazon.aws-1 SUCCESS in 20m 20s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 89ec6ba into ansible-collections:main Mar 4, 2024
39 of 40 checks passed
@hakbailey hakbailey added backport-6 PR should be backported to the stable-6 branch backport-7 PR should be backported to the stable-7 branch labels Apr 1, 2024
Copy link

patchback bot commented Apr 1, 2024

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

❌ Failed to cleanly apply 89ec6ba on top of patchback/backports/stable-6/89ec6ba2ee7fae84eb1aae098da040eba4974c7d/pr-1980

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

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/89ec6ba2ee7fae84eb1aae098da040eba4974c7d/pr-1980

Backported as #2028

🤖 @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 1, 2024
Inventory plugins do not convert template parameters

SUMMARY

Fixes #1955

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

Inventory plugin

Reviewed-by: Brian A. Teller
Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 89ec6ba)
hakbailey pushed a commit to hakbailey/amazon.aws that referenced this pull request Apr 1, 2024
…ions#1980)

Inventory plugins do not convert template parameters

SUMMARY

Fixes ansible-collections#1955

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

Inventory plugin

Reviewed-by: Brian A. Teller
Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 89ec6ba)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 1, 2024
[PR #1980/89ec6ba2 backport][stable-7] Inventory plugins do not convert template parameters

This is a backport of PR #1980 as merged into main (89ec6ba).
SUMMARY

Fixes #1955

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

Inventory plugin

Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Mandar Kulkarni <[email protected]>
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 2, 2024
…#1980) (#2030)

Manual backport: Inventory plugins do not convert template parameters (#1980)

Manual backport of #1980

Reviewed-by: Mandar Kulkarni <[email protected]>
Reviewed-by: Mike Graves <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-6 PR should be backported to the stable-6 branch backport-7 PR should be backported to the stable-7 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

lookup environment variables aws_ec2.yml file
4 participants