fix(e2e): explicitly pass oci-mediatypes=true during image build

- pass oci-mediatypes=true to image build in distribution_inspect test
- start testing against runc 1.5, containerd 2.3

Signed-off-by: Swapnanil Gupta <swpnlg@amazon.com>

Author: Swapnanil-Gupta

.github/workflows/ci.yaml

@@ -84,9 +84,9 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        runc: ["1.3.3", "1.4.0"]
-        containerd: ["1.7.30", "2.1.5", "2.2.1"]
-        nerdctl: ["2.2.0", "2.2.1"]
+        runc: ["1.3.0", 1.4.0", "1.5.0"]
+        containerd: ["1.7.30", "2.1.5", "2.2.1", "2.3.2"]
+        nerdctl: ["2.2.2", "2.3.0"]
       fail-fast: false
     timeout-minutes: 10
     steps:

e2e/tests/distribution_inspect.go

@@ -79,7 +79,9 @@ func DistributionInspect(opt *option.Option) {
 	CMD ["echo", "bar"]
 		`, defaultImage))
 			DeferCleanup(os.RemoveAll, buildContext)
-			command.Run(opt, "build", "-t", authImageTag, buildContext)
+			// Since Buildkit v0.31.0, "oci-mediatypes" defaults to true. But pass "true" explicitly to make this test
+			// compatible with older buildkit versions.
+			command.Run(opt, "build", "--output", "type=image,oci-mediatypes=true", "-t", authImageTag, buildContext)
 		})
 
 		AfterEach(func() {
@@ -181,7 +183,7 @@ func DistributionInspect(opt *option.Option) {
 			err = json.NewDecoder(res.Body).Decode(&d)
 			Expect(err).Should(BeNil())
 			Expect(d.Descriptor).ShouldNot(BeNil())
-			Expect(d.Descriptor.MediaType).Should(Equal("application/vnd.docker.distribution.manifest.v2+json"))
+			Expect(d.Descriptor.MediaType).Should(Equal("application/vnd.oci.image.manifest.v1+json"))
 			// since the image is built and pushed on the test runner, the following aspects are OS/architecture dependent
 			// and not strictly checked
 			Expect(d.Descriptor.Digest).Should(MatchRegexp(`sha256:\w{64}`))

setup-test-env.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-DEFAULT_RUNC_VERSION="1.3.3"
+DEFAULT_RUNC_VERSION="1.4.0"
 DEFAULT_CONTAINERD_VERSION="2.2.1"
-DEFAULT_NERDCTL_VERSION="2.2.1"
-DEFAULT_BUILDKIT_VERSION="0.26.3"
-DEFAULT_CNI_VERSION="1.9.0"
+DEFAULT_NERDCTL_VERSION="2.2.2"
+DEFAULT_BUILDKIT_VERSION="0.30.0"
+DEFAULT_CNI_VERSION="1.9.1"
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do