Merge pull request #1952 from saschagrunert/update-win-test-image-ltsc2022

Update Windows test image to use ltsc2022 base

Author: k8s-ci-robot

images/image-test-win/Dockerfile

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 ARG TEST
 ADD ${TEST} ${TEST}

test/e2e/inspect_test.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -55,7 +56,18 @@ var _ = t.Describe("inspect", func() {
 
 	AfterEach(func() {
 		Expect(t.Crictl("rmp -f " + sandbox)).To(Exit(0))
-		Expect(t.Crictl("rmi " + imageLatest)).To(Exit(0))
+
+		// Remove image by tag first
+		t.Crictl("rmi " + imageLatest)
+
+		// Remove any remaining digest references for this image
+		res := t.Crictl("images --filter reference=" + imageLatest + " -q")
+		contents := res.Out.Contents()
+		if len(contents) > 0 {
+			output := strings.Split(string(contents), "\n")
+			t.Crictl("rmi " + strings.TrimSpace(strings.Join(output, " ")))
+		}
+
 		t.CrictlRemovePauseImages()
 	})
 

test/e2e/inspecti_test.go

@@ -19,6 +19,7 @@ package e2e
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -39,7 +40,22 @@ var _ = t.Describe("inspecti", func() {
 	})
 
 	AfterEach(func() {
-		Expect(t.Crictl(fmt.Sprintf("rmi %s %s", image1, image2))).To(Exit(0))
+		// Remove images by tag first
+		t.Crictl(fmt.Sprintf("rmi %s %s", image1, image2))
+
+		// Remove any remaining digest references for these images
+		res := t.Crictl("images --filter reference=" + image1 + " -q")
+		contents := res.Out.Contents()
+		if len(contents) > 0 {
+			output := strings.Split(string(contents), "\n")
+			t.Crictl("rmi " + strings.TrimSpace(strings.Join(output, " ")))
+		}
+		res = t.Crictl("images --filter reference=" + image2 + " -q")
+		contents = res.Out.Contents()
+		if len(contents) > 0 {
+			output := strings.Split(string(contents), "\n")
+			t.Crictl("rmi " + strings.TrimSpace(strings.Join(output, " ")))
+		}
 	})
 
 	It("should succeed", func() {

test/e2e/pull_test.go

@@ -34,7 +34,17 @@ var _ = t.Describe("pull", func() {
 	)
 
 	AfterEach(func() {
+		// Remove images by tag/digest first
 		t.Crictl("rmi " + strings.Join([]string{image1, image2, image3}, " "))
+
+		// Remove any remaining digest references for test-image-1
+		// Note: image1 and image2 both refer to test-image-1
+		res := t.Crictl("images --filter reference=" + image1 + " -q")
+		contents := res.Out.Contents()
+		if len(contents) > 0 {
+			output := strings.Split(string(contents), "\n")
+			t.Crictl("rmi " + strings.TrimSpace(strings.Join(output, " ")))
+		}
 	})
 
 	It("should succeed without tag or digest", func() {