Skip to content

Commit b471b55

Browse files
wallyworldwallyworld
committed
Add support for centos8
Driveby fix for replacing old juju/util/series imports
1 parent b3e1811 commit b471b55

26 files changed

+84
-45
lines changed

‎cloudconfig/machinecloudconfig_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ var cloudinitDataVerifyTests = []cloudinitDataVerifyTest{
9191
containerSeries: "centos7",
9292
result: expectedResult,
9393
},
94+
{
95+
description: "centos8 on centos8",
96+
machineSeries: "centos8",
97+
containerSeries: "centos8",
98+
result: expectedResult,
99+
},
94100
{
95101
description: "win2012 on win2012",
96102
machineSeries: "win2012",

‎cmd/juju/application/setseries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/juju/errors"
99
"github.com/juju/gnuflag"
1010
"github.com/juju/names/v4"
11-
"github.com/juju/utils/series"
11+
"github.com/juju/os/series"
1212

1313
"github.com/juju/juju/api"
1414
"github.com/juju/juju/api/application"

‎container/lxd/image.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import (
88
"path"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/juju/core/status"
12-
"github.com/juju/juju/environs"
11+
jujuos "github.com/juju/os"
12+
jujuseries "github.com/juju/os/series"
1313
jujuarch "github.com/juju/utils/arch"
14-
jujuos "github.com/juju/utils/os"
15-
jujuseries "github.com/juju/utils/series"
1614
lxd "github.com/lxc/lxd/client"
1715
"github.com/lxc/lxd/shared/api"
16+
17+
"github.com/juju/juju/core/status"
18+
"github.com/juju/juju/environs"
1819
)
1920

2021
// SourcedImage is the result of a successful image acquisition.
@@ -186,8 +187,15 @@ func seriesRemoteAliases(series, arch string) ([]string, error) {
186187
case jujuos.Ubuntu:
187188
return []string{path.Join(series, arch)}, nil
188189
case jujuos.CentOS:
189-
if series == "centos7" && arch == jujuarch.AMD64 {
190-
return []string{"centos/7/amd64"}, nil
190+
if arch == jujuarch.AMD64 {
191+
switch series {
192+
case "centos7":
193+
return []string{"centos/7/amd64"}, nil
194+
case "centos8":
195+
return []string{"centos/8/amd64"}, nil
196+
default:
197+
return nil, errors.NotSupportedf("series %q", series)
198+
}
191199
}
192200
case jujuos.OpenSUSE:
193201
if series == "opensuseleap" && arch == jujuarch.AMD64 {

‎container/lxd/image_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ func (s *imageSuite) TestSeriesRemoteAliasesNotSupported(c *gc.C) {
188188
_, err := lxd.SeriesRemoteAliases("centos7", "arm64")
189189
c.Assert(err, gc.ErrorMatches, `series "centos7" not supported`)
190190

191+
_, err = lxd.SeriesRemoteAliases("centos8", "arm64")
192+
c.Assert(err, gc.ErrorMatches, `series "centos8" not supported`)
193+
191194
_, err = lxd.SeriesRemoteAliases("opensuseleap", "s390x")
192195
c.Assert(err, gc.ErrorMatches, `series "opensuseleap" not supported`)
193196
}

‎container/lxd/initialisation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package lxd
77

88
import (
9+
"github.com/juju/os/series"
910
"github.com/juju/proxy"
10-
"github.com/juju/utils/series"
1111

1212
"github.com/juju/juju/container"
1313
)

‎container/lxd/initialisation_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717

1818
"github.com/juju/collections/set"
1919
"github.com/juju/errors"
20+
"github.com/juju/os/series"
2021
"github.com/juju/packaging/manager"
2122
"github.com/juju/proxy"
22-
"github.com/juju/utils/series"
2323
"github.com/lxc/lxd/shared"
2424

2525
"github.com/juju/juju/container"

‎container/lxd/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package lxd
66
import (
77
"github.com/juju/clock"
88
"github.com/juju/errors"
9+
"github.com/juju/os"
910
"github.com/juju/utils/arch"
10-
"github.com/juju/utils/os"
1111
lxd "github.com/lxc/lxd/client"
1212
"github.com/lxc/lxd/shared"
1313
"github.com/lxc/lxd/shared/api"

‎core/series/supported.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ const (
318318
Win81 SeriesName = "win81"
319319
Win10 SeriesName = "win10"
320320
Centos7 SeriesName = "centos7"
321+
Centos8 SeriesName = "centos8"
321322
OpenSUSELeap SeriesName = "opensuseleap"
322323
GenericLinux SeriesName = "genericlinux"
323324
Kubernetes SeriesName = "kubernetes"
@@ -394,6 +395,11 @@ var nonUbuntuSeries = map[SeriesName]SeriesVersion{
394395
Version: "centos7",
395396
Supported: true,
396397
},
398+
Centos8: {
399+
WorkloadType: OtherWorkloadType,
400+
Version: "centos8",
401+
Supported: true,
402+
},
397403
OpenSUSELeap: {
398404
WorkloadType: OtherWorkloadType,
399405
Version: "opensuse42",

‎core/series/supportedseries_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (s *SupportedSeriesSuite) TestSeriesForTypes(c *gc.C) {
4141

4242
wrkSeries := info.WorkloadSeries()
4343
sort.Strings(wrkSeries)
44-
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
44+
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "centos8", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
4545
}
4646

4747
func (s *SupportedSeriesSuite) TestSeriesForTypesUsingImageStream(c *gc.C) {
@@ -59,7 +59,7 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingImageStream(c *gc.C) {
5959

6060
wrkSeries := info.WorkloadSeries()
6161
sort.Strings(wrkSeries)
62-
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "eoan", "focal", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
62+
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "centos8", "eoan", "focal", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
6363
}
6464

6565
func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidImageStream(c *gc.C) {
@@ -77,7 +77,7 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidImageStream(c *gc.C
7777

7878
wrkSeries := info.WorkloadSeries()
7979
sort.Strings(wrkSeries)
80-
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
80+
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "centos8", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
8181
}
8282

8383
func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidSeries(c *gc.C) {
@@ -95,7 +95,7 @@ func (s *SupportedSeriesSuite) TestSeriesForTypesUsingInvalidSeries(c *gc.C) {
9595

9696
wrkSeries := info.WorkloadSeries()
9797
sort.Strings(wrkSeries)
98-
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
98+
c.Assert(wrkSeries, gc.DeepEquals, []string{"bionic", "centos7", "centos8", "eoan", "genericlinux", "kubernetes", "opensuseleap", "trusty", "win10", "win2008r2", "win2012", "win2012hv", "win2012hvr2", "win2012r2", "win2016", "win2016hv", "win2016nano", "win2019", "win7", "win8", "win81", "xenial"})
9999
}
100100

101101
func makeTempFile(c *gc.C, content string) (*os.File, func()) {

‎featuretests/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414

1515
"github.com/juju/errors"
1616
"github.com/juju/names/v4"
17+
"github.com/juju/os/series"
1718
jc "github.com/juju/testing/checkers"
1819
"github.com/juju/utils"
1920
"github.com/juju/utils/arch"
20-
"github.com/juju/utils/series"
2121
"github.com/juju/version"
2222
gc "gopkg.in/check.v1"
2323
"gopkg.in/macaroon-bakery.v2/bakery"

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf
6060
github.com/juju/names/v4 v4.0.0-20200424054733-9a8294627524
6161
github.com/juju/naturalsort v0.0.0-20180423034842-5b81707e882b
62-
github.com/juju/os v0.0.0-20200323101341-8e16ce76f45e
62+
github.com/juju/os v0.0.0-20200701063157-8e6dd7a2b438
6363
github.com/juju/packaging v0.0.0-20200421095529-970596d2622a
6464
github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93
6565
github.com/juju/proxy v0.0.0-20180523025733-5f8741c297b4

‎go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ github.com/juju/naturalsort v0.0.0-20180423034842-5b81707e882b h1:Ow9ltIspVQvDdG
354354
github.com/juju/naturalsort v0.0.0-20180423034842-5b81707e882b/go.mod h1:Zqa/vGkXr78k47zM6tFmU9phhxKz/PIdqBzpLhJ86zc=
355355
github.com/juju/os v0.0.0-20190625135142-88a4c6ac59c1/go.mod h1:buR1fIbfLx3neIA/TKE8ZlS/nRR3keo+hjVqV+VR4ns=
356356
github.com/juju/os v0.0.0-20191022170002-da411304426c/go.mod h1:buR1fIbfLx3neIA/TKE8ZlS/nRR3keo+hjVqV+VR4ns=
357-
github.com/juju/os v0.0.0-20200323101341-8e16ce76f45e h1:atxWn8Xx0oEjyYxd6RmV0O2vA+imhCfDvNHKkFAcnzM=
358-
github.com/juju/os v0.0.0-20200323101341-8e16ce76f45e/go.mod h1:buR1fIbfLx3neIA/TKE8ZlS/nRR3keo+hjVqV+VR4ns=
357+
github.com/juju/os v0.0.0-20200701063157-8e6dd7a2b438 h1:OJQkulSmv3WklByylSxQxsyQXD3ufLXa8pzcnj7JhLk=
358+
github.com/juju/os v0.0.0-20200701063157-8e6dd7a2b438/go.mod h1:aswA7dG+jFZC4cTmuTphPpWS9jm7NXP5dG6jEPvfQBY=
359359
github.com/juju/packaging v0.0.0-20200421095529-970596d2622a h1:dMBYD9gIFbskcksH9ib+OvmOwwkJTS5ldwvZq3axlbY=
360360
github.com/juju/packaging v0.0.0-20200421095529-970596d2622a/go.mod h1:Brg98KsCnaxL6UxQ4pbVFlT4MoQO7x0kSzwnuvRbUy8=
361361
github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93 h1:nlmpG1/Pv5elsi69wXhLkBhefGPE19bOCJ/xVwovl7A=
@@ -411,6 +411,7 @@ github.com/juju/usso v0.0.0-20160401104424-68a59c96c178/go.mod h1:sHjHrlB/5phHrK
411411
github.com/juju/utils v0.0.0-20160526025251-ffea6ead0c37/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
412412
github.com/juju/utils v0.0.0-20161003233226-28c01ec2ad93/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
413413
github.com/juju/utils v0.0.0-20180424094159-2000ea4ff043/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
414+
github.com/juju/utils v0.0.0-20180517015153-d2ddf8edc7dc/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
414415
github.com/juju/utils v0.0.0-20180619112806-c746c6e86f4f/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
415416
github.com/juju/utils v0.0.0-20180808125547-9dfc6dbfb02b/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
416417
github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
@@ -700,6 +701,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
700701
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
701702
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
702703
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
704+
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
703705
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
704706
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
705707
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎packaging/dependency/kvm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type kvmDependency struct {
2020

2121
// PackageList implements packaging.Dependency.
2222
func (dep kvmDependency) PackageList(series string) ([]packaging.Package, error) {
23-
if series == "centos7" || series == "opensuseleap" {
23+
if series == "centos7" || series == "centos8" || series == "opensuseleap" {
2424
return nil, errors.NotSupportedf("installing kvm on series %q", series)
2525
}
2626

‎packaging/dependency/lxd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (dep lxdDependency) PackageList(series string) ([]packaging.Package, error)
2929
var pkg packaging.Package
3030

3131
switch series {
32-
case "centos7", "opensuseleap", "precise":
32+
case "centos7", "centos8", "opensuseleap", "precise":
3333
return nil, errors.NotSupportedf("LXD containers on series %q", series)
3434
case "trusty", "xenial", "bionic", blankSeries:
3535
pkg.Name = "lxd"

‎packaging/dependency/mongo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (dep mongoDependency) PackageList(series string) ([]packaging.Package, erro
3838
}
3939

4040
switch series {
41-
case "centos7", "opensuseleap", "precise":
41+
case "centos7", "centos8", "opensuseleap", "precise":
4242
return nil, errors.NotSupportedf("installing mongo on series %q", series)
4343
case "trusty":
4444
aptPkgList = append(aptPkgList, "juju-mongodb")

‎packaging/manager_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@ func (s *DependencyManagerTestSuite) SetUpTest(c *gc.C) {
2121
}
2222

2323
func (s *DependencyManagerTestSuite) TestInstallWithCentos(c *gc.C) {
24-
s.assertInstallCallsCorrectBinary(c, assertParams{
25-
series: "centos7",
26-
pkg: "foo",
27-
pm: packaging.YumPackageManager,
28-
expPkgBinary: "yum",
29-
expArgs: []string{
30-
"--assumeyes", "--debuglevel=1", "install", "foo",
31-
},
32-
})
24+
for _, series := range []string{"centos7", "centos8"} {
25+
s.assertInstallCallsCorrectBinary(c, assertParams{
26+
series: series,
27+
pkg: "foo",
28+
pm: packaging.YumPackageManager,
29+
expPkgBinary: "yum",
30+
expArgs: []string{
31+
"--assumeyes", "--debuglevel=1", "install", "foo",
32+
},
33+
})
34+
}
3335
}
3436

3537
func (s *DependencyManagerTestSuite) TestInstallWithOpenSuse(c *gc.C) {

‎provider/azure/environ_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,13 +713,19 @@ func (s *environSuite) testStartInstanceWindows(
713713
}
714714

715715
func (s *environSuite) TestStartInstanceCentOS(c *gc.C) {
716+
for _, series := range []string{"centos7", "centos8"} {
717+
s.assertStartInstanceCentOS(c, series)
718+
}
719+
}
720+
721+
func (s *environSuite) assertStartInstanceCentOS(c *gc.C, series string) {
716722
// Starting a CentOS VM, we should not expect an image query.
717723
s.PatchValue(&s.ubuntuServerSKUs, nil)
718724

719725
env := s.openEnviron(c)
720726
s.sender = s.startInstanceSenders(false)
721727
s.requests = nil
722-
args := makeStartInstanceParams(c, s.controllerUUID, "centos7")
728+
args := makeStartInstanceParams(c, s.controllerUUID, series)
723729
_, err := env.StartInstance(s.callCtx, args)
724730
c.Assert(err, jc.ErrorIsNil)
725731

‎provider/azure/internal/imageutils/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func SeriesImage(
9494
publisher = centOSPublisher
9595
offering = centOSOffering
9696
switch series {
97-
case "centos7":
97+
case "centos7", "centos8":
9898
sku = "7.3"
9999
default:
100100
return nil, errors.NotSupportedf("deploying %s", series)

‎provider/azure/internal/imageutils/images_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ func (s *imageutilsSuite) TestSeriesImageWindows(c *gc.C) {
8686
}
8787

8888
func (s *imageutilsSuite) TestSeriesImageCentOS(c *gc.C) {
89-
s.assertImageId(c, "centos7", "released", "OpenLogic:CentOS:7.3:latest")
89+
for _, series := range []string{"centos7", "centos8"} {
90+
s.assertImageId(c, series, "released", "OpenLogic:CentOS:7.3:latest")
91+
}
9092
}
9193

9294
func (s *imageutilsSuite) TestSeriesImageGenericLinux(c *gc.C) {

‎provider/common/disk_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func (s *DiskSuite) TestMinRootDiskSizeGiB(c *gc.C) {
2121
{"trusty", 8},
2222
{"win2012r2", 40},
2323
{"centos7", 8},
24+
{"centos8", 8},
2425
{"opensuseleap", 8},
2526
{"fake-series", 8},
2627
}

‎provider/common/errors_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ func (*ErrorsSuite) TestWrapZoneIndependentError(c *gc.C) {
2929

3030
stack := errors.ErrorStack(wrapped)
3131
c.Assert(stack, gc.Matches, `
32-
.*github.com/juju/juju/provider/common/errors_test.go:.*: foo
33-
.*github.com/juju/juju/provider/common/errors_test.go:.*: bar
34-
.*github.com/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
32+
.*/juju/juju/provider/common/errors_test.go:.*: foo
33+
.*/juju/juju/provider/common/errors_test.go:.*: bar
34+
.*/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
3535
}
3636

3737
func (s *ErrorsSuite) TestInvalidCredentialWrapped(c *gc.C) {
@@ -46,9 +46,9 @@ func (s *ErrorsSuite) TestInvalidCredentialWrapped(c *gc.C) {
4646

4747
stack := errors.ErrorStack(err)
4848
c.Assert(stack, gc.Matches, `
49-
.*github.com/juju/juju/provider/common/errors_test.go:.*: foo
50-
.*github.com/juju/juju/provider/common/errors_test.go:.*: bar
51-
.*github.com/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
49+
.*/juju/juju/provider/common/errors_test.go:.*: foo
50+
.*/juju/juju/provider/common/errors_test.go:.*: bar
51+
.*/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
5252
}
5353

5454
func (s *ErrorsSuite) TestInvalidCredentialNew(c *gc.C) {

‎provider/oci/environ.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/juju/clock"
1414
"github.com/juju/errors"
15+
"github.com/juju/os"
16+
jujuseries "github.com/juju/os/series"
1517
"github.com/juju/utils/arch"
16-
"github.com/juju/utils/os"
17-
jujuseries "github.com/juju/utils/series"
1818
"github.com/juju/version"
1919
"github.com/kr/pretty"
2020

‎provider/oci/images.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import (
1313
"time"
1414

1515
"github.com/juju/errors"
16-
// jujuos "github.com/juju/utils/os"
17-
"github.com/juju/utils/series"
16+
"github.com/juju/os/series"
1817

1918
"github.com/juju/juju/environs/imagemetadata"
2019
"github.com/juju/juju/environs/instances"

‎service/discovery_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ var discoveryTests = []discoveryTest{{
131131
os: jujuos.CentOS,
132132
series: "centos7",
133133
expected: service.InitSystemSystemd,
134+
}, {
135+
os: jujuos.CentOS,
136+
series: "centos8",
137+
expected: service.InitSystemSystemd,
134138
}, {
135139
os: jujuos.OpenSUSE,
136140
series: "opensuseleap",

‎upgrades/steps_24.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/utils/series"
11+
"github.com/juju/os/series"
1212

1313
"github.com/juju/juju/service"
1414
)

‎version/current_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (*CurrentSuite) TestCurrentSeries(c *gc.C) {
3737
if s != "n/a" {
3838
// There is no lsb_release command on CentOS.
3939
if current_os == os.CentOS {
40-
c.Check(s, gc.Matches, `centos7`)
40+
c.Check(s, gc.Matches, `centos7|centos8`)
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)