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.

Sign up for GitHub

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

Jump to bottom

Added Jammy series as supported. #13480

Merged
merged 2 commits into from
Nov 15, 2021
Merged

Added Jammy series as supported. #13480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a67cd31
Added Jammy series as supported.
Nov 5, 2021
055c061
Upgrade juju/os to v2.1.3
Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/series/supported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ const (
Groovy SeriesName = "groovy"
Hirsute SeriesName = "hirsute"
Impish SeriesName = "impish"
Jammy SeriesName = "jammy"
)

var ubuntuSeries = map[SeriesName]seriesVersion{
Expand Down Expand Up @@ -343,6 +344,13 @@ var ubuntuSeries = map[SeriesName]seriesVersion{
WorkloadType: ControllerWorkloadType,
Version: "21.10",
},
Jammy: {
WorkloadType: ControllerWorkloadType,
Version: "22.04",
LTS: true,
Supported: true,
ESMSupported: true,
},
}

const (
Expand Down
10 changes: 6 additions & 4 deletions core/series/supportedseries_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (s *SupportedSeriesLinuxSuite) TestLatestLts(c *gc.C) {
latest, want string
}{
{"testseries", "testseries"},
{"", "focal"},
{"", "jammy"},
}
for _, test := range table {
SetLatestLtsForTesting(test.latest)
Expand All @@ -57,6 +57,7 @@ func (s *SupportedSeriesLinuxSuite) TestUbuntuSeriesVersion(c *gc.C) {
{"bionic", "18.04"},
{"eoan", "19.10"},
{"focal", "20.04"},
{"jammy", "22.04"},
}
for _, v := range isUbuntuTests {
ver, err := UbuntuSeriesVersion(v.series)
Expand All @@ -79,7 +80,8 @@ func (s *SupportedSeriesLinuxSuite) TestWorkloadSeries(c *gc.C) {
series, err := WorkloadSeries(time.Time{}, "", "")
c.Assert(err, jc.ErrorIsNil)
c.Assert(series.SortedValues(), gc.DeepEquals, []string{
"bionic", "centos7", "centos8", "focal", "genericlinux", "kubernetes", "opensuseleap",
"trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2",
"win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
"bionic", "centos7", "centos8", "focal", "genericlinux", "jammy", "kubernetes",
"opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv",
"win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019",
"win7", "win8", "win81", "xenial"})
}
16 changes: 8 additions & 8 deletions core/series/supportedseries_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ func (s *SupportedSeriesSuite) TestSeriesForTypes(c *gc.C) {
c.Assert(err, jc.ErrorIsNil)

ctrlSeries := info.controllerSeries()
c.Assert(ctrlSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty"})
c.Assert(ctrlSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty"})

wrkSeries := info.workloadSeries(false)
c.Assert(wrkSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
c.Assert(wrkSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
}

func (s *SupportedSeriesSuite) TestSeriesForTypesUsingImageStream(c *gc.C) {
Expand All @@ -53,10 +53,10 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingImageStream(c *gc.C) {
c.Assert(err, jc.ErrorIsNil)

ctrlSeries := info.controllerSeries()
c.Assert(ctrlSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty"})
c.Assert(ctrlSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty"})

wrkSeries := info.workloadSeries(false)
c.Assert(wrkSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
c.Assert(wrkSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
}

func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidImageStream(c *gc.C) {
Expand All @@ -69,10 +69,10 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidImageStream(c *gc.C
c.Assert(err, jc.ErrorIsNil)

ctrlSeries := info.controllerSeries()
c.Assert(ctrlSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty"})
c.Assert(ctrlSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty"})

wrkSeries := info.workloadSeries(false)
c.Assert(wrkSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
c.Assert(wrkSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
}

func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidSeries(c *gc.C) {
Expand All @@ -85,10 +85,10 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidSeries(c *gc.C) {
c.Assert(err, jc.ErrorIsNil)

ctrlSeries := info.controllerSeries()
c.Assert(ctrlSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty"})
c.Assert(ctrlSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty"})

wrkSeries := info.workloadSeries(false)
c.Assert(wrkSeries, jc.DeepEquals, []string{"focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
c.Assert(wrkSeries, jc.DeepEquals, []string{"jammy", "focal", "bionic", "xenial", "trusty", "centos7", "centos8", "genericlinux", "kubernetes", "opensuseleap", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81"})
}

var getOSFromSeriesTests = []struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ require (
github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf
github.com/juju/names/v4 v4.0.0-20200929085019-be23e191fee0
github.com/juju/naturalsort v0.0.0-20180423034842-5b81707e882b
github.com/juju/os/v2 v2.1.2
github.com/juju/os/v2 v2.1.3
github.com/juju/packaging/v2 v2.0.0-20210628104420-5487e24f1350
github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93
github.com/juju/proxy v0.0.0-20210817195502-c6015cfe0258
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ github.com/juju/os v0.0.0-20190625135142-88a4c6ac59c1/go.mod h1:buR1fIbfLx3neIA/
github.com/juju/os v0.0.0-20191022170002-da411304426c h1:iJZl5krsl2AqkgU7IiJ2/jNAchctLFa3BiKdyOUvK+g=
github.com/juju/os v0.0.0-20191022170002-da411304426c/go.mod h1:buR1fIbfLx3neIA/TKE8ZlS/nRR3keo+hjVqV+VR4ns=
github.com/juju/os/v2 v2.0.0/go.mod h1:S/AadPYIeAZtep7zu519c+eWGWV7dVR+Hb8RTGBR1+I=
github.com/juju/os/v2 v2.1.2 h1:RZ1mRJ/fx6O6KpLBLaNwMbb+EMI+iEfBPTdb3CWpi7w=
github.com/juju/os/v2 v2.1.2/go.mod h1:S/AadPYIeAZtep7zu519c+eWGWV7dVR+Hb8RTGBR1+I=
github.com/juju/os/v2 v2.1.3 h1:BIfGCBy4ZQ7I2xRjIVcE+cPP0+OSwkgf01TD6g3m8Yc=
github.com/juju/os/v2 v2.1.3/go.mod h1:S/AadPYIeAZtep7zu519c+eWGWV7dVR+Hb8RTGBR1+I=
github.com/juju/packaging/v2 v2.0.0-20210628104420-5487e24f1350 h1:WpkR19siuBHnaPfe8WochnyEtzVEYS7TlDoF/l83VUI=
github.com/juju/packaging/v2 v2.0.0-20210628104420-5487e24f1350/go.mod h1:QkkuIt0as7ewiNyrDrr1MyyRm3TVrabyMsLQdr97Sx8=
github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93 h1:nlmpG1/Pv5elsi69wXhLkBhefGPE19bOCJ/xVwovl7A=
Expand Down