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

fix installing collections from git repos that contain MANIFEST.json #79808

Merged
merged 5 commits into from Jan 26, 2023

Conversation

s-hertel
Copy link
Contributor

SUMMARY

Fixes #79796

As of 595413d, collections in git repos can contain a galaxy.yml or MANIFEST.json (just like non-git repo directories).

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ansible-galaxy collection install

@ansibot ansibot added affects_2.15 bug This issue/PR relates to a bug. needs_triage Needs a first human triage before being processed. labels Jan 24, 2023
Copy link
Member

@sivel sivel left a comment

Choose a reason for hiding this comment

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

This looks good. Should we add a test?

@s-hertel s-hertel force-pushed the a-g-fix-installing-built-git-src branch from d2eabf0 to ded17a0 Compare January 25, 2023 16:33
@ansibot ansibot added the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Jan 25, 2023
Copy link
Member

@sivel sivel left a comment

Choose a reason for hiding this comment

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

Re-approving. LGTM

@ansibot ansibot added shipit This PR is ready to be merged by Core needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. shipit This PR is ready to be merged by Core labels Jan 25, 2023
@bcoca
Copy link
Member

bcoca commented Jan 26, 2023

I thought we had established that to install from git galaxy.yml was a requirement

@ansibot ansibot added shipit This PR is ready to be merged by Core needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. shipit This PR is ready to be merged by Core labels Jan 26, 2023
@s-hertel
Copy link
Contributor Author

@bcoca That was the plan, but it changed in 2.11 with the feature of installing collections from non-git dir/subdirs. Now SCM collections are just a wrapper collection that has a dir or subdirs dependency. We would have needed to make a distinction between directories that originate from SCM collections and other directories, and that was vetoed at the time.

@ansibot ansibot added shipit This PR is ready to be merged by Core needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. shipit This PR is ready to be merged by Core labels Jan 26, 2023
@s-hertel s-hertel added the ci_verified Changes made in this PR are causing tests to fail. label Jan 26, 2023
@ansibot ansibot removed ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jan 26, 2023
@ansibot ansibot added the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Jan 26, 2023
@s-hertel s-hertel force-pushed the a-g-fix-installing-built-git-src branch from da0b114 to 283511f Compare January 26, 2023 17:54
@ansibot ansibot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Jan 26, 2023
@mattclay mattclay removed the needs_triage Needs a first human triage before being processed. label Jan 26, 2023
@mattclay mattclay merged commit 321848e into ansible:devel Jan 26, 2023
s-hertel added a commit to s-hertel/ansible that referenced this pull request Jan 26, 2023
…nsible#79808)

* add null 'manifest' key to metadata for git repo collections containing MANIFEST.json

changelog

* set to Sentinel instead of None

* Test installing a collection in a git repo that contains a MANIFEST.json

* fix test

* Update changelogs/fragments/ansible-galaxy-install-git-src-manifest.yml

(cherry picked from commit 321848e)
@ansible ansible locked and limited conversation to collaborators Feb 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.15 bug This issue/PR relates to a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2.14 Issue with installing custom collections
5 participants