From d8ace48ea67cd44cf53603211622d6ec239a2093 Mon Sep 17 00:00:00 2001 From: Alastair Flynn Date: Mon, 29 Apr 2024 10:34:00 +0100 Subject: [PATCH] Update supported series and mark jammy as supported --- series/supportedseries.go | 8 ++++++-- series/supportedseries_linux_test.go | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/series/supportedseries.go b/series/supportedseries.go index 77a5fb8..e4e149f 100644 --- a/series/supportedseries.go +++ b/series/supportedseries.go @@ -83,6 +83,10 @@ var seriesVersions = map[string]string{ "hirsute": "21.04", "impish": "21.10", "jammy": "22.04", + "kinetic": "22.10", + "lunar": "23.04", + "mantic": "23.10", + "noble": "24.04", "win2008r2": "win2008r2", "win2012hvr2": "win2012hvr2", "win2012hv": "win2012hv", @@ -218,8 +222,8 @@ var ubuntuSeries = map[string]SeriesVersionInfo{ "jammy": { Version: "22.04", LTS: true, - Supported: false, - ESMSupported: false, + Supported: true, + ESMSupported: true, }, "kinetic": { Version: "22.10", diff --git a/series/supportedseries_linux_test.go b/series/supportedseries_linux_test.go index 0b3c7de..29814e1 100644 --- a/series/supportedseries_linux_test.go +++ b/series/supportedseries_linux_test.go @@ -100,7 +100,7 @@ func (s *supportedSeriesSuite) TestESMSupportedJujuSeries(c *gc.C) { c.Assert(err, jc.ErrorIsNil) s.PatchValue(series.UbuntuDistroInfoPath, filename) - expectedSeries := []string{"focal", "bionic", "xenial", "trusty"} + expectedSeries := []string{"jammy", "focal", "bionic", "xenial", "trusty"} series := series.ESMSupportedJujuSeries() c.Assert(series, jc.DeepEquals, expectedSeries) } @@ -243,7 +243,7 @@ func (s *isolationSupportedSeriesSuite) TestBadFilePath(c *gc.C) { filename := filepath.Join(d, "bad-file.csv") s.PatchValue(series.UbuntuDistroInfoPath, filename) - expectedSeries := []string{"artful", "bionic", "centos7", "centos8", "centos9", "cosmic", "disco", "eoan", "focal", "genericlinux", "groovy", "hirsute", "impish", "jammy", "opensuseleap", "precise", "quantal", "raring", "saucy", "trusty", "utopic", "vivid", "wily", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial", "yakkety", "zesty"} + expectedSeries := []string{"artful", "bionic", "centos7", "centos8", "centos9", "cosmic", "disco", "eoan", "focal", "genericlinux", "groovy", "hirsute", "impish", "jammy", "kinetic", "lunar", "mantic", "noble", "opensuseleap", "precise", "quantal", "raring", "saucy", "trusty", "utopic", "vivid", "wily", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial", "yakkety", "zesty"} series := series.SupportedSeries() sort.Strings(series) c.Assert(series, gc.DeepEquals, expectedSeries)