Skip to content

Commit

Permalink
Merge pull request juju#17380 from jack-w-shaw/bump_os_patch
Browse files Browse the repository at this point in the history
juju#17380

Bump version of juju/os/v2

In juju/os/v2 v2.2.4, we incorrectly hardcoded the version of the noble release of Ubuntu as `24.40`. It should be `24.04`.

We fix this in `v2.2.5`. See:
https://github.com/juju/os/releases/tag/v2.2.5

## QA steps

### Bootstrap juju
```
juju bootstrap lxd lxd-2.9
```

### Deploy to noble

Download and modify a local charm
```
$ juju download ubuntu
$ unzip ubuntu_r24.charm
(edit manifest.yaml & metadata.yaml such that)
$ cat ubuntu/manifest.yaml
bases:
 - architectures:
 - amd64
 channel: '20.04'
 name: ubuntu
 - architectures:
 - amd64
 channel: '22.04'
 name: ubuntu
 - architectures:
 - amd64
 channel: '24.04'
 name: ubuntu

$ cat metadata.yaml
name: ubuntu
summary: A pristine Ubuntu Server
maintainer: Charmers <juju@lists.ubuntu.com>
description: |
 This simply deploys the Ubuntu Cloud/Server image
tags:
 - misc
series:
 - focal
 - bionic
 - jammy
 - noble
...
``` 

Deploy
```
$ juju deploy ./ubuntu --series noble
$ juju status
Model Controller Cloud/Region Version SLA Timestamp
default lxd-2.9 localhost/localhost 2.9.50.1 unsupported 08:16:15+01:00

App Version Status Scale Charm Channel Rev Exposed Message
ubuntu 24.04 active 1 ubuntu 0 no

Unit Workload Agent Machine Public address Ports Message
ubuntu/1* active idle 1 10.219.211.30

Machine State Address Inst id Series AZ Message
1 started 10.219.211.30 juju-ec6a7e-1 noble Running
```
  • Loading branch information
jujubot committed May 16, 2024
2 parents cfad18e + c287366 commit 78004ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ require (
github.com/juju/mutex/v2 v2.0.0
github.com/juju/names/v4 v4.0.0
github.com/juju/naturalsort v1.0.0
github.com/juju/os/v2 v2.2.4
github.com/juju/os/v2 v2.2.5
github.com/juju/packaging/v2 v2.0.1
github.com/juju/persistent-cookiejar v1.0.0
github.com/juju/proxy v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@ github.com/juju/names/v4 v4.0.0 h1:XeQZbwT70i98TynM+2RJr9At6EGb9X/P6l8qF56hPns=
github.com/juju/names/v4 v4.0.0/go.mod h1:xpkrQpHbz1DGY+0Geo32ZnyognGA/2vSB++rpu/Z+Lc=
github.com/juju/naturalsort v1.0.0 h1:kGmUUy3h8mJ5/SJYaqKOBR3f3owEd5R52Lh+Tjg/dNM=
github.com/juju/naturalsort v1.0.0/go.mod h1:Zqa/vGkXr78k47zM6tFmU9phhxKz/PIdqBzpLhJ86zc=
github.com/juju/os/v2 v2.2.4 h1:8vfmTAYzEwz4bQb8zPOVHa+RstYCn9VFfFQgb8jQqiI=
github.com/juju/os/v2 v2.2.4/go.mod h1:igGQLjgRSwUery5ZhV/1pZjZkMwnfkAwWCwh5ZfIg+c=
github.com/juju/os/v2 v2.2.5 h1:Ayw9aC7axKtGgzy3dFRKx84FxasfISMege0iYDsH6io=
github.com/juju/os/v2 v2.2.5/go.mod h1:igGQLjgRSwUery5ZhV/1pZjZkMwnfkAwWCwh5ZfIg+c=
github.com/juju/packaging/v2 v2.0.1 h1:KeTfqx3Z0c6RcM053GJH7mplroXoRSuh/dK5vqDQLn8=
github.com/juju/packaging/v2 v2.0.1/go.mod h1:JC+FIRTJXGLt9wA+iP3ltkzv+aWVMMojB/R47uIAK0Y=
github.com/juju/persistent-cookiejar v1.0.0 h1:Ag7+QLzqC2m+OYXy2QQnRjb3gTkEBSZagZ6QozwT3EQ=
Expand Down

0 comments on commit 78004ae

Please sign in to comment.