From a67cd3121727692539aed7d403e2d35851cad8ab Mon Sep 17 00:00:00 2001 From: Juan Tirado Date: Fri, 5 Nov 2021 10:40:40 +0100 Subject: [PATCH 1/2] Added Jammy series as supported. --- core/series/supported.go | 8 ++++++++ core/series/supportedseries_linux_test.go | 10 ++++++---- core/series/supportedseries_test.go | 16 ++++++++-------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/core/series/supported.go b/core/series/supported.go index d1e7171021c..a2d10c3a944 100644 --- a/core/series/supported.go +++ b/core/series/supported.go @@ -249,6 +249,7 @@ const ( Groovy SeriesName = "groovy" Hirsute SeriesName = "hirsute" Impish SeriesName = "impish" + Jammy SeriesName = "jammy" ) var ubuntuSeries = map[SeriesName]seriesVersion{ @@ -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 ( diff --git a/core/series/supportedseries_linux_test.go b/core/series/supportedseries_linux_test.go index 39193f578bf..7aaeebed99d 100644 --- a/core/series/supportedseries_linux_test.go +++ b/core/series/supportedseries_linux_test.go @@ -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) @@ -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) @@ -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"}) } diff --git a/core/series/supportedseries_test.go b/core/series/supportedseries_test.go index 0e817385c15..26e9851cbc2 100644 --- a/core/series/supportedseries_test.go +++ b/core/series/supportedseries_test.go @@ -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) { @@ -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) { @@ -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) { @@ -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 { From 055c0617e970a3688cd2c5bdf48b571fc3ecc4c2 Mon Sep 17 00:00:00 2001 From: Juan Tirado Date: Mon, 8 Nov 2021 13:47:34 +0100 Subject: [PATCH 2/2] Upgrade juju/os to v2.1.3 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d5a11f4fd5..16e10a0376d 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index a6b79f6ce9d..8a8a9382112 100644 --- a/go.sum +++ b/go.sum @@ -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=