Update defaultServer name change tests

test/go.mod

@@ -4,7 +4,6 @@ go 1.18
 
 require (
 	github.com/containers/podman/v4 v4.5.1
-	github.com/docker/docker v24.0.2+incompatible
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.7
 )
@@ -36,6 +35,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/disiqueira/gotree/v3 v3.0.2 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
+	github.com/docker/docker v24.0.2+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -77,9 +77,7 @@ require (
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mistifyio/go-zfs/v3 v3.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

test/go.sum

@@ -24,7 +24,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 h1:SCbEWT58NSt7d2mcFdvxC9uyrdcTfvBbPLThhkDmXzg=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
@@ -654,15 +653,11 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
 github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=

test/test_suite_test.go

@@ -25,7 +25,7 @@ func TestTest(t *testing.T) {
 }
 
 var _ = Describe("Open Liberty container images", func() {
-	// Set ENV CONTAINER_HOST and CONTAINER_SSHKEY
+	// Set CONTAINER_HOST and CONTAINER_SSHKEY environment variables beforehand
 	Context("kernel-slim images", func() {
 		var imageDir string = "../releases/latest/kernel-slim"
 		BeforeEach(func() {
@@ -42,7 +42,7 @@ var _ = Describe("Open Liberty container images", func() {
 		})
 
 		It("can build an UBI image and run spring-petclinic", func() {
-			var baseImage string = "open-liberty-test:kernel-slim-ubi-openjdk8"
+			var baseImage string = "open-liberty-test:kernel-slim-ubi-openjdk17"
 			var petClinicImage string = "open-liberty-test:kernel-slim-ubi-petclinic"
 			var petClinicImageName string = "petclinic"
 			conn, err := bindings.NewConnectionWithIdentity(context.Background(), "", "", true)
@@ -52,7 +52,7 @@ var _ = Describe("Open Liberty container images", func() {
 			}
 
 			// Build a kernel-slim image from scratch
-			containerFiles := []string{imageDir + "/Dockerfile.ubi.openjdk8"}
+			containerFiles := []string{imageDir + "/Dockerfile.ubi.openjdk17"}
 			// Check the full list of BuildOptions from https://github.com/containers/buildah/blob/aa6a281df7c54aa42a060baa9d0504040c7551a6/define/build.go#L112
 			buildOptions := entities.BuildOptions{}
 			buildOptions.ContextDirectory = imageDir
@@ -119,7 +119,7 @@ var _ = Describe("Open Liberty container images", func() {
 		})
 
 		It("can build an Ubuntu image and run spring-petclinic", func() {
-			var baseImage string = "open-liberty-test:kernel-slim-ubuntu-openjdk8"
+			var baseImage string = "open-liberty-test:kernel-slim-ubuntu-openjdk17"
 			var petClinicImage string = "open-liberty-test:kernel-slim-ubuntu-petclinic"
 			var petClinicImageName string = "petclinic"
 			conn, err := bindings.NewConnectionWithIdentity(context.Background(), "", "", true)
@@ -129,7 +129,7 @@ var _ = Describe("Open Liberty container images", func() {
 			}
 
 			// Build a kernel-slim image from scratch
-			containerFiles := []string{imageDir + "/Dockerfile.ubuntu.openjdk8"}
+			containerFiles := []string{imageDir + "/Dockerfile.ubuntu.openjdk17"}
 			// Check the full list of BuildOptions from https://github.com/containers/buildah/blob/aa6a281df7c54aa42a060baa9d0504040c7551a6/define/build.go#L112
 			buildOptions := entities.BuildOptions{}
 			buildOptions.ContextDirectory = imageDir