dev - resolve local charms relative to bundle base path #10487
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This functionality was introduced in the 2.6 branch which doesn't currently use the refactored overlay merging code from charm.v6. Relative charm paths are now directly resolved into absolute paths inside the bundle compose code so the fix from 2.6 is not required.
achilleasa
changed the title
SimonRichardson
approved these changes
Aug 6, 2019
|
|
achilleasa
deleted the
dev-resolve-local-charms-relative-to-bundle-base-path
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
This PR updates the develop branch to use the latest
charm.v6version which includes an improved fix for resolving relative charm paths when deploying bundles (compared to the one that landed on the 2.6 branch via #10484).The main problem with the 2.6 fix is that it was applied against the composed (with all overlays already merged in) bundle and that all relative charm paths were resolved using the base path of the bundle. The 2.6 fix does not work properly if an overlay living at a different location than the bundle specifies a relative charm path.
However, the develop branch uses a different code path (introduced by #10476) and merges overlays via helper functions provided by the
charm.v6package. The new way of doing things enables us to properly resolve relative paths even for overlays.Consequently, the original fix has now been removed but its related test has been kept so we can avoid any regressions in the future.
QA steps
Exactly the same as with #10484 with the exception that the last QA step that involves an overlay must work as expected with the juju CLI from this PR.