Skip to content

test illegal instruction fixes #3464

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

Closed
jedevc wants to merge 2 commits into from
Closed

test illegal instruction fixes #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70ed4b
add cpuinfo to github action
jedevc Jan 6, 2023
89e666c
use busybox 1.35 for sha256sum
jedevc Jan 6, 2023
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
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ jobs:
version: ${{ env.BUILDX_VERSION }}
driver-opts: image=${{ env.REPO_SLUG_ORIGIN }}
buildkitd-flags: --debug
-
name: /proc/cpuinfo
run: |
cat /proc/cpuinfo
-
name: Test pkg=${{ matrix.pkg }} ; typ=${{ matrix.typ }} ; skipit=${{ matrix.skip-integration-tests }} ; worker=${{ matrix.worker }}
run: |
Expand Down
8 changes: 4 additions & 4 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@ func testFileOpCopyIncludeExclude(t *testing.T, sb integration.Sandbox) {
),
)

busybox := llb.Image("busybox:latest")
busybox := llb.Image("busybox:1.35")
run := func(cmd string) {
st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).AddMount("/wd", st)
}
Expand Down Expand Up @@ -4558,7 +4558,7 @@ func testBasicCacheImportExport(t *testing.T, sb integration.Sandbox, cacheOptio
require.NoError(t, err)
defer c.Close()

busybox := llb.Image("busybox:latest")
busybox := llb.Image("busybox:1.35")
st := llb.Scratch()

run := func(cmd string) {
Expand Down Expand Up @@ -4685,7 +4685,7 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)
defer c.Close()

busybox := llb.Image("busybox:latest")
busybox := llb.Image("busybox:1.35")
st := llb.Scratch()

run := func(cmd string) {
Expand Down Expand Up @@ -8237,7 +8237,7 @@ func testMultipleCacheExports(t *testing.T, sb integration.Sandbox) {
}
require.NoError(t, err)

busybox := llb.Image("busybox:latest")
busybox := llb.Image("busybox:1.35")
st := llb.Scratch()
run := func(cmd string) {
st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).AddMount("/wd", st)
Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/dockerfile_mount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ from busybox AS build
copy cachebust /
run mkdir out && echo foo > out/foo

from busybox as second
from busybox:1.35 as second
RUN --mount=from=build,src=out,target=/out,rw touch /out/bar && cat /dev/urandom | head -c 100 | sha256sum > /unique

from scratch
Expand Down
12 changes: 6 additions & 6 deletions frontend/dockerfile/dockerfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ func testCopyWildcardCache(t *testing.T, sb integration.Sandbox) {
f := getFrontend(t, sb)

dockerfile := []byte(`
FROM busybox AS base
FROM busybox:1.35 AS base
COPY foo* files/
RUN cat /dev/urandom | head -c 100 | sha256sum > unique
COPY bar files/
Expand Down Expand Up @@ -3907,7 +3907,7 @@ func testCacheMultiPlatformImportExport(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)

dockerfile := []byte(`
FROM --platform=$BUILDPLATFORM busybox AS base
FROM --platform=$BUILDPLATFORM busybox:1.35 AS base
ARG TARGETARCH
RUN echo -n $TARGETARCH> arch && cat /dev/urandom | head -c 100 | sha256sum > unique
FROM scratch
Expand Down Expand Up @@ -4030,7 +4030,7 @@ func testCacheImportExport(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)

dockerfile := []byte(`
FROM busybox AS base
FROM busybox:1.35 AS base
COPY foo const
#RUN echo -n foobar > const
RUN cat /dev/urandom | head -c 100 | sha256sum > unique
Expand Down Expand Up @@ -4268,9 +4268,9 @@ func testNoCache(t *testing.T, sb integration.Sandbox) {
f := getFrontend(t, sb)

dockerfile := []byte(`
FROM busybox AS s0
FROM busybox:1.35 AS s0
RUN cat /dev/urandom | head -c 100 | sha256sum | tee unique
FROM busybox AS s1
FROM busybox:1.35 AS s1
RUN cat /dev/urandom | head -c 100 | sha256sum | tee unique2
FROM scratch
COPY --from=s0 unique /
Expand Down Expand Up @@ -4743,7 +4743,7 @@ func testFrontendInputs(t *testing.T, sb integration.Sandbox) {

destDir := t.TempDir()

outMount := llb.Image("busybox").Run(
outMount := llb.Image("busybox:1.35").Run(
llb.Shlex(`sh -c "cat /dev/urandom | head -c 100 | sha256sum > /out/foo"`),
).AddMount("/out", llb.Scratch())

Expand Down