-
Notifications
You must be signed in to change notification settings - Fork 526
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
Bump balchua/microk8s-actions #16242
Merged
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
Should use the sha like in #16234 |
@hpidcock why should we use the SHA instead of tagged version? I thought that was bad practice? |
SHA version is supported by dependabot. The reason to use the sha version is the author of the plugin can't change that version. With the tagged version, they could change the code without you knowing about it. |
e52dc47
to
d9d9d40
Compare
hpidcock
approved these changes
Sep 19, 2023
/merge |
Merged
Merged
Merged
Merged
jujubot
added a commit
that referenced
this pull request
Sep 25, 2023
#16317 Forward merge: - #16249 - #16273 - #16281 - #16284 - #16242 - #16286 - #16291 - #16292 - #16266 - #16306 - #16308 - #16310 - #16311 - #16312 Conflicts: - api/agent/uniter/charm.go - api/agent/uniter/charm_test.go - api/agent/uniter/uniter.go - apiserver/authentication/jwt/jwt_test.go - apiserver/charms_test.go - apiserver/facades/agent/caasoperator/mock_test.go - apiserver/facades/agent/caasoperator/operator.go - apiserver/facades/agent/caasoperator/state.go - apiserver/facades/agent/instancemutater/instancemutater.go - apiserver/facades/agent/instancemutater/lxdprofilewatcher.go - apiserver/facades/agent/uniter/newlxdprofile.go - apiserver/facades/agent/uniter/newlxdprofile_test.go - apiserver/facades/agent/uniter/uniter.go - apiserver/facades/agent/uniter/uniter_test.go - apiserver/facades/client/application/application_test.go - apiserver/facades/client/application/application_unit_test.go - apiserver/facades/client/charms/client_test.go - apiserver/facades/client/client/status.go - apiserver/facades/client/client/testing/suite.go - apiserver/facades/controller/charmdownloader/charmdownloader.go - apiserver/facades/controller/charmrevisionupdater/interface.go - apiserver/rest_test.go - cmd/juju/application/bundle_test.go - cmd/juju/application/deploy_test.go - cmd/juju/application/refresh_test.go - cmd/juju/application/unexpose_test.go - cmd/juju/status/status_internal_test.go - core/cache/cachetest/state.go - core/charm/downloader/mocks/storage_mocks.go - juju/testing/conn.go - juju/testing/repo.go - state/application.go - state/charm_test.go - state/cleanup.go - state/export_test.go - state/migration_import_test.go - worker/caasoperator/download.go - worker/modelcache/worker_test.go - worker/uniter/op_callbacks.go - worker/uniter/remotestate/mock_test.go - worker/uniter/remotestate/state.go - worker/uniter/remotestate/watcher.go - worker/uniter/runner/context/util_test.go - worker/uniter/uniter.go - worker/uniter/uniter_test.go - worker/uniter/util_test.go All conflicts arose due to #16279 Most conflicts were trivial to solve (conflicts within imports, changes to code that was deleted, etc.) but a fair few were complex. A fair amount of work was required to resolve failing tests as well ## QA steps All unit test pass A number of specific integration test pass: ``` ./main.sh -v -c aws -p ec2 deploy test_deploy_charms ./main.sh -v -c aws -p ec2 refresh ``` ``` juju bootstrap lxd lxd juju add-model m juju deploy ubuntu juju deploy postgresql ```
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.
We are seeing intermittent failures on tests involving microk8s, due to an issue balchua/microk8s-actions#20 where the action is timing out waiting for storage to become available.
Update to the latest version, where the timeout has been increased to 15 minutes - hopefully this will alleviate this issue somewhat.