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 the validate model upgrade from a facade #12093

Merged
merged 2 commits into from Oct 6, 2020

Conversation

SimonRichardson
Copy link
Member

Description of change

This was fixed originally in develop, but actually needed to be fixed in
the 2.8 branch. Essentially this makes upgrading to 2.8 invalid because
it expects that you already have the facade available.

QA steps

Please replace with how we can verify that the change works?

$ git checkout ab69570b38fbc746e54184e4c3274612bcbb8327 # 2.8.3 tag
$ make go-install
$ juju bootstrap lxd test --build-agent

$ git checkout 2.8
$ make go-install
$ juju upgrade-model --build-agent

Bug reference

https://bugs.launchpad.net/juju/+bug/1895963

This was fixed originally in develop, but actually needed to be fixed in
the 2.8 branch. Essentially this makes upgrading to 2.8 invalid because
it expects that you already have the facade available.
@SimonRichardson SimonRichardson added bug The PR addresses a bug 2.8 labels Oct 6, 2020
@SimonRichardson SimonRichardson self-assigned this Oct 6, 2020
@SimonRichardson
Copy link
Member Author

$$merge$$

This test was supposed to land together with commit d1b5f22 but was
unfortunately skipped.
@SimonRichardson
Copy link
Member Author

$$merge$$

@SimonRichardson
Copy link
Member Author

$$merge$$

FAIL: status_internal_test.go:4616: StatusSuite.TestStatusAllFormats

@jujubot jujubot merged commit 513b1d3 into juju:2.8 Oct 6, 2020
@SimonRichardson SimonRichardson deleted the fix-upgrade-model branch October 6, 2020 14:51
manadart pushed a commit to manadart/juju that referenced this pull request Oct 7, 2020
juju#12093

## Description of change

This was fixed originally in develop, but actually needed to be fixed in
the 2.8 branch. Essentially this makes upgrading to 2.8 invalid because
it expects that you already have the facade available.

## QA steps

*Please replace with how we can verify that the change works?*

```sh
$ git checkout ab69570 # 2.8.3 tag
$ make go-install
$ juju bootstrap lxd test --build-agent

$ git checkout 2.8
$ make go-install
$ juju upgrade-model --build-agent
```

## Bug reference

https://bugs.launchpad.net/juju/+bug/1895963
jujubot added a commit that referenced this pull request Oct 7, 2020
#12097

Merges #12093 onto the 2.8.4 release + version increment, so we can fix model upgrades.
@wallyworld wallyworld mentioned this pull request Oct 8, 2020
jujubot added a commit that referenced this pull request Oct 8, 2020
#12107

Merge 2.8 bringing in these PRs:

#12046 handle no application info for workload status
#12049 k8s service account roles
#12050 better vsphere logging
#12062 run upgrade-charm after uniter restart if one is pending
#12073 for bindings updateOps, only 1 per space is necessary
#12070 fix rotation of k8s charms due to pod spec map ordering issue
#12093 fix validation of model upgrade
#12067 correct scoping of network-get to ensure public ip first
#12083 pin transient dependency in operator image
#12069 do not run start hook when no reboot

## QA steps

See individual PRs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug The PR addresses a bug
Projects
None yet
4 participants