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.

Sign up for GitHub

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

Jump to bottom

docker: Fix dockerinventory script to group containers by label not ip #3736

Merged
merged 3 commits into from
Sep 24, 2024
Merged

docker: Fix dockerinventory script to group containers by label not ip #3736

merged 3 commits into from
Sep 24, 2024

Conversation

Haroon-Khel
Copy link
Contributor

@Haroon-Khel Haroon-Khel commented Sep 20, 2024 •
edited
Loading

  • commit message has one of the standard prefixes
  • faq.md updated if appropriate
  • other documentation is changed or added (if applicable)
  • playbook changes run through VPC or QPC (if you have access)
  • VPC/QPC not applicable for this PR
  • for inventory.yml changes, bastillion/nagios/jenkins updated accordingly

Fixes #3735

The script now groups together static containers by looking for the hw.dockerhost.$dockerhost label in their jenkins config, instead of by ip

steelhead31
steelhead31 approved these changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@karianna
Copy link
Contributor

Assume Solaris failures are unrelated.

@Haroon-Khel Haroon-Khel merged commit d483066 into adoptium:master Sep 24, 2024
11 of 12 checks passed
@Haroon-Khel Haroon-Khel deleted the dockerinventoryscript.update branch September 24, 2024 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steelhead31 steelhead31 steelhead31 approved these changes

@karianna karianna karianna approved these changes

@sxa sxa Awaiting requested review from sxa

Assignees
No one assigned
Labels
ansible docker
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Static docker inventory script does not handle nodes which have no IP in their Jenkins config
3 participants
@Haroon-Khel @karianna @steelhead31