Skip to content

Add local resources support for oci-images#486

Merged
jujubot merged 3 commits intojuju:masterfrom
DomFleischmann:local-resources
Apr 27, 2021
Merged

Add local resources support for oci-images#486
jujubot merged 3 commits intojuju:masterfrom
DomFleischmann:local-resources

Conversation

@DomFleischmann
Copy link
Copy Markdown

@DomFleischmann DomFleischmann commented Apr 15, 2021 •
edited
Loading

This commit enables support for local resources of the oci-image type for charms.

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

11 similar comments
@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Copy Markdown
Contributor

jujubot commented Apr 15, 2021

Can one of the admins verify this patch?

@DomFleischmann DomFleischmann force-pushed the local-resources branch 2 times, most recently from 193fab3 to c34a908 Compare April 15, 2021 12:56
johnsca
johnsca suggested changes Apr 21, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@johnsca johnsca left a comment

Choose a reason for hiding this comment

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

There are some fixes that need to be made in the test, but the code itself LGTM.

Comment thread juju/model.py
Comment thread tests/integration/oci-image-charm/dispatch Outdated
Comment thread tests/integration/test_model.py
Comment thread tests/integration/test_model.py Outdated
Comment thread tests/integration/test_model.py Outdated
Comment thread tests/integration/test_model.py Outdated
Comment thread tests/integration/oci-image-charm/metadata.yaml Outdated
Add local resources support for oci-images
0eed3c1 
This commit enables support for local resources
of the oci-image type.
@johnsca
Copy link
Copy Markdown
Contributor

johnsca commented Apr 26, 2021

!!build!!

johnsca
johnsca suggested changes Apr 26, 2021
View reviewed changes
Comment thread tests/integration/test_model.py Outdated
@johnsca
Copy link
Copy Markdown
Contributor

johnsca commented Apr 26, 2021

Integration tests are still failing due to the snapd profile issue, not relevant to this change. I confirmed locally that the added test works.

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 26, 2021

$$merge$$

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 26, 2021

!!build!!

1 similar comment
@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 26, 2021

!!build!!

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 26, 2021

Just fighting with CI atm, sorry for the noise.

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 26, 2021

!! build!!

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 27, 2021

!!build!!

@SimonRichardson
Copy link
Copy Markdown
Member

SimonRichardson commented Apr 27, 2021

$$merge$$

@jujubot jujubot merged commit f973a80 into juju:master Apr 27, 2021
johnsca added a commit that referenced this pull request Jun 17, 2021
@johnsca
Fix 'metadata referenced before assignment' error
db6be93 
For the life of me, I can't figure out how this wasn't caught by the
test added in #486.
@johnsca johnsca mentioned this pull request Jun 17, 2021
Merged
jujubot added a commit that referenced this pull request Jun 18, 2021
@jujubot
Merge pull request #509 from juju/johnsca/metadata-referenced-before-…
0bac4ef 
…assignment

#509

For the life of me, I can't figure out how this wasn't caught by the test added in #486.
@johnsca johnsca mentioned this pull request Jun 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SimonRichardson SimonRichardson SimonRichardson approved these changes

+1 more reviewer

@johnsca johnsca johnsca approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@DomFleischmann @jujubot @johnsca @SimonRichardson