Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Swapnanil-Gupta merged 1 commit into from
Jun 29, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ 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.3", "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"]
buildkit: ["0.30.0", "0.31.0"]
fail-fast: false
timeout-minutes: 10
steps:
Expand All @@ -100,7 +101,7 @@ jobs:
sudo systemctl stop docker
sudo systemctl stop containerd
- name: Install Dependencies for e2e Testing
run: ./setup-test-env.sh --runc-version ${{ matrix.runc }} --containerd-version ${{ matrix.containerd }} --nerdctl-version ${{ matrix.nerdctl }}
run: ./setup-test-env.sh --runc-version ${{ matrix.runc }} --containerd-version ${{ matrix.containerd }} --nerdctl-version ${{ matrix.nerdctl }} --buildkit-version ${{ matrix.buildkit }}
- name: Download build artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
Expand Down
6 changes: 4 additions & 2 deletions e2e/tests/distribution_inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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}`))
Expand Down
8 changes: 4 additions & 4 deletions setup-test-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.31.0"
DEFAULT_CNI_VERSION="1.9.1"

# Parse command line arguments
while [[ $# -gt 0 ]]; do
Expand Down
Loading