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

Bump balchua/microk8s-actions #16242

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Conversation

barrettj12
Copy link
Contributor

@barrettj12 barrettj12 commented Sep 13, 2023

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.

@hpidcock
Copy link
Member

Should use the sha like in #16234

@barrettj12
Copy link
Contributor Author

@hpidcock why should we use the SHA instead of tagged version? I thought that was bad practice?

@hpidcock
Copy link
Member

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.

@barrettj12 barrettj12 changed the title Bump balchua/microk8s-actions to v0.4.1 Bump balchua/microk8s-actions Sep 19, 2023
@barrettj12
Copy link
Contributor Author

/merge

@jujubot jujubot merged commit 29fb0c1 into juju:2.9 Sep 19, 2023
@barrettj12 barrettj12 mentioned this pull request Sep 19, 2023
jujubot added a commit that referenced this pull request Sep 19, 2023
#16286

Merges the following patches:
- #16242
- #16284
- #16281

### Conflicts
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- version/version.go
@barrettj12 barrettj12 mentioned this pull request Sep 22, 2023
jujubot added a commit that referenced this pull request Sep 22, 2023
@barrettj12 barrettj12 mentioned this pull request Sep 22, 2023
jujubot added a commit that referenced this pull request Sep 22, 2023
#16312

Merges the following patches:
- #16311
- #16310
- #16308
- #16306
- #16266
- #16292
- #16291
- #16286
- #16242
- #16284
- #16281
- #16273
- #16249

### Conflicts
- .github/workflows/microk8s-tests.yml
- .github/workflows/smoke.yml
- .github/workflows/upgrade.yml
@jack-w-shaw jack-w-shaw mentioned this pull request Sep 25, 2023
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants