Skip to content

Commit

Permalink
use busybox instead of ubuntu images for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wdbaruni committed Oct 23, 2024
1 parent 12402d3 commit 5411c40
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 71 deletions.
38 changes: 19 additions & 19 deletions cmd/cli/docker/docker_run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *DockerRunSuite) TestRun_GenericSubmit() {
ctx := context.Background()
randomUUID := uuid.New()
_, out, err := s.ExecuteTestCobraCommand("docker", "run",
"ubuntu",
"busybox:latest",
"echo",
randomUUID.String(),
)
Expand All @@ -67,7 +67,7 @@ func (s *DockerRunSuite) TestRun_DryRun() {
randomUUID := uuid.New()
entrypointCommand := fmt.Sprintf("echo %s", randomUUID.String())
stdout, _, err := s.Execute("docker", "run",
"ubuntu",
"busybox:latest",
entrypointCommand,
"--dry-run",
)
Expand Down Expand Up @@ -137,7 +137,7 @@ func (s *DockerRunSuite) TestRun_GenericSubmitWait() {

_, out, err := s.ExecuteTestCobraCommand("docker", "run",
"--wait",
"ubuntu",
"busybox:latest",
"--",
"echo", "hello from docker submit wait",
)
Expand Down Expand Up @@ -170,7 +170,7 @@ func (s *DockerRunSuite) TestRun_SubmitUrlInputs() {
flagsArray := []string{"docker", "run"}

flagsArray = append(flagsArray, urls.inputURL.flag, urls.inputURL.url)
flagsArray = append(flagsArray, "ubuntu", "cat", fmt.Sprintf("%s/%s", urls.inputURL.pathInContainer, urls.inputURL.filename))
flagsArray = append(flagsArray, "busybox:latest", "cat", fmt.Sprintf("%s/%s", urls.inputURL.pathInContainer, urls.inputURL.filename))

_, out, err := s.ExecuteTestCobraCommand(flagsArray...)
s.Require().NoError(err, "Error submitting job")
Expand All @@ -189,7 +189,7 @@ func (s *DockerRunSuite) TestRun_SubmitUrlInputs() {
func (s *DockerRunSuite) TestRun_CreatedAt() {
ctx := context.Background()
_, out, err := s.ExecuteTestCobraCommand("docker", "run",
"ubuntu",
"busybox:latest",
"echo", "'hello world'",
)
s.NoError(err, "Error submitting job.")
Expand All @@ -208,8 +208,8 @@ func (s *DockerRunSuite) TestRun_EdgeCaseCLI() {
fatalErr bool
errString string
}{
{submitArgs: []string{"ubuntu", "-xoo -bar -baz"}, fatalErr: true, errString: "unknown shorthand flag"}, // submitting flag will fail if not separated with a --
{submitArgs: []string{"ubuntu", "python -xoo -bar -baz"}, fatalErr: false, errString: ""}, // separating with -- should work and allow flags
{submitArgs: []string{"busybox:latest", "-xoo -bar -baz"}, fatalErr: true, errString: "unknown shorthand flag"}, // submitting flag will fail if not separated with a --
{submitArgs: []string{"busybox:latest", "python -xoo -bar -baz"}, fatalErr: false, errString: ""}, // separating with -- should work and allow flags
// {submitString: "-v QmeZRGhe4PmjctYVSVHuEiA9oSXnqmYa4kQubSHgWbjv72:/input_images -o results:/output_images dpokidov/imagemagick -- magick mogrify -fx '((g-b)/(r+g+b))>0.02 ? 1 : 0' -resize 256x256 -quality 100 -path /output_images /input_images/*.jpg"},
}

Expand Down Expand Up @@ -263,7 +263,7 @@ func (s *DockerRunSuite) TestRun_SubmitWorkdir() {
ctx := context.Background()
flagsArray := []string{"docker", "run"}
flagsArray = append(flagsArray, "-w", tc.workdir)
flagsArray = append(flagsArray, "ubuntu", "pwd")
flagsArray = append(flagsArray, "busybox:latest", "pwd")

_, out, err := s.ExecuteTestCobraCommand(flagsArray...)

Expand Down Expand Up @@ -302,7 +302,7 @@ func (s *DockerRunSuite) TestRun_ExplodeVideos() {
"docker", "run",
"--wait",
"-i", fmt.Sprintf("file://%s,dst=/inputs", s.AllowListedPath),
"ubuntu", "echo", "hello",
"busybox:latest", "echo", "hello",
}

_, _, submitErr := s.ExecuteTestCobraCommand(allArgs...)
Expand Down Expand Up @@ -354,7 +354,7 @@ func (s *DockerRunSuite) TestTruncateReturn() {
ctx := context.Background()
_, out, err := s.ExecuteTestCobraCommand(
"docker", "run",
"ubuntu", "--", "perl", "-e", fmt.Sprintf(`print "=" x %d`, tc.inputLength),
"busybox:latest", "--", "perl", "-e", fmt.Sprintf(`print "=" x %d`, tc.inputLength),
)
s.Require().NoError(err, "Error submitting job. Name: %s. Expected Length: %s", name, tc.expectedLength)

Expand Down Expand Up @@ -400,7 +400,7 @@ func (s *DockerRunSuite) TestRun_MultipleURLs() {

args = append(args, "docker", "run")
args = append(args, tc.inputFlags...)
args = append(args, "ubuntu", "--", "ls", "/input")
args = append(args, "busybox:latest", "--", "ls", "/input")

_, out, err := s.ExecuteTestCobraCommand(args...)
s.Require().NoError(err, "Error submitting job")
Expand All @@ -421,8 +421,8 @@ func (s *DockerRunSuite) TestRun_BadExecutables() {
errStringContains string
}{
"good-image-good-executable": {
imageName: "ubuntu", // Good image // TODO we consider an untagged image poor practice, fix this
executable: "ls", // Good executable
imageName: "busybox:latest", // Good image // TODO we consider an untagged image poor practice, fix this
executable: "ls", // Good executable
isValid: true,
errStringContains: "",
},
Expand All @@ -433,8 +433,8 @@ func (s *DockerRunSuite) TestRun_BadExecutables() {
errStringContains: "image not available",
},
"good-image-bad-executable": {
imageName: "ubuntu", // Good image // TODO we consider an untagged image poor practice, fix this
executable: "BADEXECUTABLE", // Bad executable
imageName: "busybox:latest", // Good image // TODO we consider an untagged image poor practice, fix this
executable: "BADEXECUTABLE", // Bad executable
isValid: false,
errStringContains: "executable file not found",
},
Expand Down Expand Up @@ -497,7 +497,7 @@ func (s *DockerRunSuite) TestRun_InvalidImage() {
func (s *DockerRunSuite) TestRun_Timeout_DefaultValue() {
ctx := context.Background()
_, out, err := s.ExecuteTestCobraCommand("docker", "run",
"ubuntu",
"busybox:latest",
"echo", "'hello world'",
)
s.NoError(err, "Error submitting job without defining a timeout value")
Expand All @@ -516,7 +516,7 @@ func (s *DockerRunSuite) TestRun_Timeout_DefinedValue() {
_, out, err := s.ExecuteTestCobraCommand("docker", "run",
"--timeout", fmt.Sprintf("%d", int64(expectedTimeout.Seconds())),
"--queue-timeout", fmt.Sprintf("%d", int64(expectedQueueTimeout.Seconds())),
"ubuntu",
"busybox:latest",
"echo", "'hello world'",
)
s.NoError(err, "Error submitting job with a defined a timeout value")
Expand All @@ -530,7 +530,7 @@ func (s *DockerRunSuite) TestRun_Timeout_DefinedValue() {
func (s *DockerRunSuite) TestRun_NoPublisher() {
ctx := context.Background()

_, out, err := s.ExecuteTestCobraCommand("docker", "run", "ubuntu", "echo", "'hello world'")
_, out, err := s.ExecuteTestCobraCommand("docker", "run", "busybox:latest", "echo", "'hello world'")
s.Require().NoError(err)

job := testutils.GetJobFromTestOutput(ctx, s.T(), s.ClientV2, out)
Expand All @@ -550,7 +550,7 @@ func (s *DockerRunSuite) TestRun_NoPublisher() {
func (s *DockerRunSuite) TestRun_LocalPublisher() {
ctx := context.Background()

_, out, err := s.ExecuteTestCobraCommand("docker", "run", "-p", "local", "ubuntu", "echo", "'hello world'")
_, out, err := s.ExecuteTestCobraCommand("docker", "run", "-p", "local", "busybox:latest", "echo", "'hello world'")
s.Require().NoError(err)

job := testutils.GetJobFromTestOutput(ctx, s.T(), s.ClientV2, out)
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/job/get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ func (s *GetSuite) getDockerRunArgs(extraArgs []string) []string {
}
args = append(args, extraArgs...)
args = append(args,
"ubuntu:kinetic",
"busybox:latest",
"--",
"bash", "-c",
"sh", "-c",
"echo hello > /data/file.txt && echo hello && mkdir /data/apples && echo oranges > /data/apples/file.txt",
)
return args
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestBidsBasedOnImagePlatform(t *testing.T) {

t.Run("positive response for supported architecture", func(t *testing.T) {
response, err := strategy.ShouldBid(context.Background(), bidstrategy.BidStrategyRequest{
Job: jobForDockerImage(t, "ubuntu"),
Job: jobForDockerImage(t, "busybox:latest"),
})

require.NoError(t, err)
Expand All @@ -70,15 +70,15 @@ func TestBidsBasedOnImagePlatform(t *testing.T) {
semantic.ManifestCache = cc

response, err := strategy.ShouldBid(context.Background(), bidstrategy.BidStrategyRequest{
Job: jobForDockerImage(t, "ubuntu:latest"),
Job: jobForDockerImage(t, "busybox:latest"),
})

require.NoError(t, err)
require.Equal(t, true, response.ShouldBid)

// Second time we expect should be cached
response, err = strategy.ShouldBid(context.Background(), bidstrategy.BidStrategyRequest{
Job: jobForDockerImage(t, "ubuntu:latest"),
Job: jobForDockerImage(t, "busybox:latest"),
})

require.NoError(t, err)
Expand Down
26 changes: 13 additions & 13 deletions pkg/executor/docker/executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ func (s *ExecutorTestSuite) TestDockerResourceLimitsCPU() {
// same 0.1 value that 100m means
// https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_monitoring_and_updating_the_kernel/using-cgroups-v2-to-control-distribution-of-cpu-time-for-applications_managing-monitoring-and-updating-the-kernel#proc_controlling-distribution-of-cpu-time-for-applications-by-adjusting-cpu-bandwidth_using-cgroups-v2-to-control-distribution-of-cpu-time-for-applications

es, err := dockermodels.NewDockerEngineBuilder("ubuntu:20.04").
WithEntrypoint("bash", "-c", "cat /sys/fs/cgroup/cpu.max").
es, err := dockermodels.NewDockerEngineBuilder("busybox:1.37").
WithEntrypoint("sh", "-c", "cat /sys/fs/cgroup/cpu.max").
Build()
s.Require().NoError(err)

Expand Down Expand Up @@ -261,8 +261,8 @@ func (s *ExecutorTestSuite) TestDockerResourceLimitsMemory() {
}

for _, p := range tests {
es, err := dockermodels.NewDockerEngineBuilder("ubuntu:20.04").
WithEntrypoint("bash", "-c", "cat /sys/fs/cgroup/memory.max").
es, err := dockermodels.NewDockerEngineBuilder("busybox:1.37").
WithEntrypoint("sh", "-c", "cat /sys/fs/cgroup/memory.max").
Build()
s.Require().NoError(err)

Expand Down Expand Up @@ -386,8 +386,8 @@ func (s *ExecutorTestSuite) TestDockerExecutionCancellation() {
errC := make(chan error, 1)
executionID := uuid.New().String()

es, err := dockermodels.NewDockerEngineBuilder("ubuntu").
WithEntrypoint("bash", "-c", "sleep 30").
es, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "-c", "sleep 30").
Build()

s.Require().NoError(err)
Expand Down Expand Up @@ -448,8 +448,8 @@ func (s *ExecutorTestSuite) TestTimesOutCorrectly() {
jobCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()

es, err := dockermodels.NewDockerEngineBuilder("ubuntu").
WithEntrypoint("bash", "-c", fmt.Sprintf(`sleep 1 && echo "%s" && sleep 20`, expected)).
es, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "-c", fmt.Sprintf(`sleep 1 && echo "%s" && sleep 20`, expected)).
Build()
s.Require().NoError(err)
task := mock.Task()
Expand Down Expand Up @@ -504,8 +504,8 @@ func (s *ExecutorTestSuite) TestDockerStreamsAlreadyComplete() {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

es, err := dockermodels.NewDockerEngineBuilder("ubuntu").
WithEntrypoint("bash", "cat /sys/fs/cgroup/cpu.max").
es, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "cat /sys/fs/cgroup/cpu.max").
Build()
s.Require().NoError(err)
task := mock.Task()
Expand All @@ -531,8 +531,8 @@ func (s *ExecutorTestSuite) TestDockerStreamsAlreadyComplete() {
func (s *ExecutorTestSuite) TestDockerStreamsSlowTask() {
id := "streams-ok"

es, err := dockermodels.NewDockerEngineBuilder("ubuntu").
WithEntrypoint("bash", "-c", "echo hello && sleep 20").
es, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "-c", "echo hello && sleep 20").
Build()
s.Require().NoError(err)

Expand Down Expand Up @@ -565,7 +565,7 @@ func (s *ExecutorTestSuite) TestDockerStreamsSlowTask() {
}

func (s *ExecutorTestSuite) TestDockerOOM() {
es, err := dockermodels.NewDockerEngineBuilder("ubuntu").
es, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("tail", "/dev/zero").
Build()
s.Require().NoError(err)
Expand Down
10 changes: 5 additions & 5 deletions pkg/jobstore/boltdb/store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (s *BoltJobstoreTestSuite) SetupTest() {
for _, fixture := range jobFixtures {
s.clock.Add(1 * time.Second)
job := makeDockerEngineJob(
[]string{"bash", "-c", "echo hello"})
[]string{"sh", "-c", "echo hello"})

job.ID = fixture.id
job.Type = fixture.jobType
Expand Down Expand Up @@ -704,7 +704,7 @@ func (s *BoltJobstoreTestSuite) TestSearchJobs() {

func (s *BoltJobstoreTestSuite) TestDeleteJob() {
job := makeDockerEngineJob(
[]string{"bash", "-c", "echo hello"})
[]string{"sh", "-c", "echo hello"})
job.Labels = map[string]string{"tag": "value"}
job.ID = "deleteme"
job.Namespace = "client1"
Expand Down Expand Up @@ -907,7 +907,7 @@ func (s *BoltJobstoreTestSuite) TestShortIDs() {
shortString := "9308d0d2"

job := makeDockerEngineJob(
[]string{"bash", "-c", "echo hello"})
[]string{"sh", "-c", "echo hello"})
job.ID = uuidString
job.Namespace = "110"

Expand Down Expand Up @@ -941,7 +941,7 @@ func (s *BoltJobstoreTestSuite) TestEvents() {
)

job := makeDockerEngineJob(
[]string{"bash", "-c", "echo hello"})
[]string{"sh", "-c", "echo hello"})
job.ID = "10"
job.Namespace = "110"

Expand Down Expand Up @@ -1244,7 +1244,7 @@ func makeDockerEngineJob(entrypointArray []string) *models.Job {
j.Task().Engine = &models.SpecConfig{
Type: models.EngineDocker,
Params: map[string]interface{}{
"Image": "ubuntu:latest",
"Image": "busybox:latest",
"Entrypoint": entrypointArray,
},
}
Expand Down
16 changes: 8 additions & 8 deletions pkg/lib/marshaller/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ func TestUnmarshalJob(t *testing.T) {
"Engine": {
"Type": "docker",
"Params": {
"Image": "ubuntu:latest",
"Image": "busybox:latest",
"Entrypoint": [
"/bin/bash"
"/bin/sh"
],
"Parameters": [
"-c",
Expand Down Expand Up @@ -52,9 +52,9 @@ func TestUnmarshalJob(t *testing.T) {
"Engine": {
"Type": "docker",
"Params": {
"Image": "ubuntu:latest",
"Image": "busybox:latest",
"Entrypoint": [
"/bin/bash"
"/bin/sh"
],
"Parameters": [
"-c",
Expand Down Expand Up @@ -84,9 +84,9 @@ func TestUnmarshalJob(t *testing.T) {
"Engine": {
"Type": "docker",
"Params": {
"Image": "ubuntu:latest",
"Image": "busybox:latest",
"Entrypoint": [
"/bin/bash"
"/bin/sh"
],
"Parameters": [
"-c",
Expand Down Expand Up @@ -115,9 +115,9 @@ func TestUnmarshalJob(t *testing.T) {
"Engine": {
"Type": "docker",
"Params": {
"Image": "ubuntu:latest",
"Image": "busybox:latest",
"Entrypoint": [
"/bin/bash"
"/bin/sh"
],
"Parameters": [
"-c",
Expand Down
4 changes: 2 additions & 2 deletions pkg/test/compute/cancel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ func (s *CancelSuite) TestCancelDocker() {
ctx := context.Background()

// prepare a docker execution that sleeps for 10 seconds so we can cancel it
dockerSpec, err := dockermodels.NewDockerEngineBuilder("ubuntu").
WithEntrypoint("bash", "-c", "sleep 10").
dockerSpec, err := dockermodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "-c", "sleep 10").
Build()
s.NoError(err)

Expand Down
4 changes: 2 additions & 2 deletions pkg/test/devstack/default_publisher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func getTestEngine() *models.SpecConfig {
return &models.SpecConfig{
Type: models.EngineDocker,
Params: dockmodels.EngineSpec{
Image: "ubuntu:latest",
Entrypoint: []string{"/bin/bash", "-c", `
Image: "busybox:latest",
Entrypoint: []string{"/bin/sh", "-c", `
echo "output to stdout" && \
if [ ! -d /outputs ]; then \
mkdir -p /outputs; \
Expand Down
4 changes: 2 additions & 2 deletions pkg/test/devstack/errorlogs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func executorTestCases(t testing.TB) []*models.Job {
Tasks: []*models.Task{
{
Name: t.Name(),
Engine: dockmodels.NewDockerEngineBuilder("ubuntu:latest").
WithEntrypoint("bash", "-c", "echo -n 'apples' >&1; echo -n 'oranges' >&2; exit 19;").
Engine: dockmodels.NewDockerEngineBuilder("busybox:latest").
WithEntrypoint("sh", "-c", "echo -n 'apples' >&1; echo -n 'oranges' >&2; exit 19;").
MustBuild(),
Publisher: publisher_local.NewSpecConfig(),
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/executor/docker_entrypoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ type dockerfilePermutation struct {
func createDockerfile(d dockerfilePermutation) string {
ep := "\nENTRYPOINT [\"/bin/echo\"]"
cmd := "\nCMD [\"echo\", \"This is from CMD\"]"
baseDockerFile := "FROM alpine:latest"
baseDockerFile := "FROM busybox:latest"
if d.entrypoint == true {
baseDockerFile += ep
}
Expand Down
Loading

0 comments on commit 5411c40

Please sign in to comment.