diff --git a/wanda/forge_test.go b/wanda/forge_test.go index cd0d3f76..38b8aa9b 100644 --- a/wanda/forge_test.go +++ b/wanda/forge_test.go @@ -172,7 +172,7 @@ func TestForge_withHints(t *testing.T) { t.Fatalf("build: %v", err) } - const tag = "cr.ray.io/rayproject/hello" + const tag = "cr.ray.io/rayproject/hello-hint" ref, err := name.ParseReference(tag) if err != nil { @@ -214,11 +214,11 @@ func TestForge(t *testing.T) { NamePrefix: "cr.ray.io/rayproject/", } - if err := Build("testdata/hello.wanda.yaml", config); err != nil { + if err := Build("testdata/hello-test.wanda.yaml", config); err != nil { t.Fatalf("build: %v", err) } - const tag = "cr.ray.io/rayproject/hello" + const tag = "cr.ray.io/rayproject/hello-test" ref, err := name.ParseReference(tag) if err != nil { @@ -283,7 +283,7 @@ func TestForge_noCache(t *testing.T) { t.Fatalf("build: %v", err) } - const tag = "cr.ray.io/rayproject/hello" + const tag = "cr.ray.io/rayproject/hello-nocache" ref, err := name.ParseReference(tag) if err != nil { @@ -362,7 +362,7 @@ func TestForgeWithRemoteWorkRepo(t *testing.T) { Epoch: "1", } - if err := Build("testdata/hello.wanda.yaml", config); err != nil { + if err := Build("testdata/hello-test.wanda.yaml", config); err != nil { t.Fatalf("build hello: %v", err) } @@ -405,7 +405,7 @@ func TestForgeWithRemoteWorkRepo(t *testing.T) { t.Fatalf("make new forge: %v", err) } - helloSpec, err := parseSpecFile("testdata/hello.wanda.yaml") + helloSpec, err := parseSpecFile("testdata/hello-test.wanda.yaml") if err != nil { t.Fatalf("parse hello spec: %v", err) } @@ -420,7 +420,7 @@ func TestForgeWithRemoteWorkRepo(t *testing.T) { t.Errorf("got %d cache hits, want 1", hit) } - hello := fmt.Sprintf("%s/work:def456-hello", crAddr) + hello := fmt.Sprintf("%s/work:def456-hello-test", crAddr) helloRef, err := name.ParseReference(hello) if err != nil { t.Fatalf("parse hello reference: %v", err) @@ -475,7 +475,7 @@ func TestForgeLocal_withNamePrefix(t *testing.T) { Epoch: randomEpoch(), } - if err := Build("testdata/hello.wanda.yaml", config); err != nil { + if err := Build("testdata/hello-test.wanda.yaml", config); err != nil { t.Fatalf("build hello: %v", err) } @@ -518,7 +518,7 @@ func TestForgeLocal_withNamePrefix(t *testing.T) { t.Fatalf("make new forge: %v", err) } - helloSpec, err := parseSpecFile("testdata/hello.wanda.yaml") + helloSpec, err := parseSpecFile("testdata/hello-test.wanda.yaml") if err != nil { t.Fatalf("parse hello spec: %v", err) } @@ -531,7 +531,7 @@ func TestForgeLocal_withNamePrefix(t *testing.T) { t.Errorf("got %d cache hits, want 1", hit) } - hello := "localhost:5000/rayci-work:abc123-hello" + hello := "localhost:5000/rayci-work:abc123-hello-test" helloRef, err := name.ParseReference(hello) if err != nil { t.Fatalf("parse hello reference: %v", err) diff --git a/wanda/testdata/Dockerfile.world b/wanda/testdata/Dockerfile.world index 945139ab..cf3ca1cc 100644 --- a/wanda/testdata/Dockerfile.world +++ b/wanda/testdata/Dockerfile.world @@ -1,3 +1,3 @@ -FROM cr.ray.io/rayproject/hello +FROM cr.ray.io/rayproject/hello-test COPY world.txt /opt/app/world.txt diff --git a/wanda/testdata/hello-hint.wanda.yaml b/wanda/testdata/hello-hint.wanda.yaml index c8ee1dc7..c3f946aa 100644 --- a/wanda/testdata/hello-hint.wanda.yaml +++ b/wanda/testdata/hello-hint.wanda.yaml @@ -1,4 +1,4 @@ -name: hello +name: hello-hint dockerfile: Dockerfile.hello build_hint_args: - MESSAGE=hint message diff --git a/wanda/testdata/hello-nocache.wanda.yaml b/wanda/testdata/hello-nocache.wanda.yaml index c6cf8d56..84cb6d97 100644 --- a/wanda/testdata/hello-nocache.wanda.yaml +++ b/wanda/testdata/hello-nocache.wanda.yaml @@ -1,3 +1,3 @@ -name: hello +name: hello-nocache dockerfile: Dockerfile.hello disable_caching: true diff --git a/wanda/testdata/hello.wanda.yaml b/wanda/testdata/hello-test.wanda.yaml similarity index 63% rename from wanda/testdata/hello.wanda.yaml rename to wanda/testdata/hello-test.wanda.yaml index 10c589a2..088a64d8 100644 --- a/wanda/testdata/hello.wanda.yaml +++ b/wanda/testdata/hello-test.wanda.yaml @@ -1,2 +1,2 @@ -name: hello +name: hello-test dockerfile: Dockerfile.hello diff --git a/wanda/testdata/world.wanda.yaml b/wanda/testdata/world.wanda.yaml index d9b9ff7b..bf89b928 100644 --- a/wanda/testdata/world.wanda.yaml +++ b/wanda/testdata/world.wanda.yaml @@ -1,5 +1,5 @@ name: world dockerfile: Dockerfile.world -froms: [ "cr.ray.io/rayproject/hello" ] +froms: [ "cr.ray.io/rayproject/hello-test" ] srcs: - world.txt