Skip to content

Commit d09894c

Browse files
feat(raycicmd): add artifacts_dir to wanda steps
Configured dependent on GOOS. This way we can upload Wheels etc. as part of the Wanda step itself. Labels: draft Topic: raycicmd-artifacts Relative: wanda-artifact-cli Signed-off-by: andrew <andrew@anyscale.com>
1 parent e45039d commit d09894c

File tree

5 files changed

+42
-0
lines changed

5 files changed

+42
-0
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM alpine:latest
2+
3+
RUN mkdir -p /build/dist /app/bin \
4+
&& echo "wheel-content-1.0" > /build/dist/mypackage-1.0.0.whl \
5+
&& echo "wheel-content-1.1" > /build/dist/mypackage-1.1.0.whl \
6+
&& echo "binary-content" > /app/bin/myapp \
7+
&& chmod +x /app/bin/myapp
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: artifact-test
2+
froms:
3+
- alpine:latest
4+
dockerfile: .buildkite/artifact-test.Dockerfile
5+
artifacts:
6+
- src: /app/bin/myapp
7+
dst: bin/myapp
8+
- src: /build/dist/*.whl
9+
dst: wheels/
10+
- src: /nonexistent/optional-file.txt
11+
dst: optional.txt
12+
optional: true

.buildkite/forge.rayci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ steps:
3434
- name: forge-arm64
3535
wanda: .buildkite/forge-arm64.wanda.yaml
3636
instance_type: builder-arm64
37+
38+
- name: artifact-test
39+
tags: wanda
40+
wanda: .buildkite/artifact-test.wanda.yaml

raycicmd/converter.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package raycicmd
22

33
import (
44
"fmt"
5+
"runtime"
56
)
67

78
type converter struct {
@@ -31,6 +32,12 @@ func newConverter(config *config, info *buildInfo) *converter {
3132
envMap["RAYCI_FORGE_PREFIX"] = config.ForgePrefix
3233
}
3334

35+
if runtime.GOOS == "windows" {
36+
envMap["RAYCI_ARTIFACTS_DIR"] = "/c/artifact-mount"
37+
} else {
38+
envMap["RAYCI_ARTIFACTS_DIR"] = "/artifact-mount"
39+
}
40+
3441
if c.config.ArtifactsBucket != "" && info.gitCommit != "" {
3542
dest := fmt.Sprintf(
3643
"s3://%s/%s/%s",

raycicmd/converter_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ func TestConvertPipelineStep(t *testing.T) {
174174
"RAYCI_WORK_REPO": "fakeecr",
175175
"RAYCI_BRANCH": "beta",
176176
"RAYCI_STEP_ID": fakeStepID,
177+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
177178

178179
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
179180
},
@@ -198,6 +199,7 @@ func TestConvertPipelineStep(t *testing.T) {
198199
"RAYCI_WORK_REPO": "fakeecr",
199200
"RAYCI_BRANCH": "beta",
200201
"RAYCI_STEP_ID": fakeStepID,
202+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
201203

202204
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
203205
},
@@ -223,6 +225,7 @@ func TestConvertPipelineStep(t *testing.T) {
223225
"RAYCI_WORK_REPO": "fakeecr",
224226
"RAYCI_BRANCH": "beta",
225227
"RAYCI_STEP_ID": fakeStepID,
228+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
226229

227230
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
228231
},
@@ -252,6 +255,7 @@ func TestConvertPipelineStep(t *testing.T) {
252255
"RAYCI_WORK_REPO": "fakeecr",
253256
"RAYCI_BRANCH": "beta",
254257
"RAYCI_STEP_ID": fakeStepID,
258+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
255259

256260
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
257261
},
@@ -275,6 +279,7 @@ func TestConvertPipelineStep(t *testing.T) {
275279
"RAYCI_WORK_REPO": "fakeecr",
276280
"RAYCI_BRANCH": "beta",
277281
"RAYCI_STEP_ID": fakeStepID,
282+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
278283

279284
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
280285
},
@@ -307,6 +312,7 @@ func TestConvertPipelineStep(t *testing.T) {
307312
"RAYCI_WORK_REPO": "fakeecr",
308313
"RAYCI_BRANCH": "beta",
309314
"RAYCI_STEP_ID": fakeStepID,
315+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
310316

311317
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
312318
},
@@ -340,6 +346,7 @@ func TestConvertPipelineStep(t *testing.T) {
340346
"RAYCI_WORK_REPO": "fakeecr",
341347
"RAYCI_BRANCH": "beta",
342348
"RAYCI_STEP_ID": fakeStepID,
349+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
343350

344351
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
345352
},
@@ -363,6 +370,7 @@ func TestConvertPipelineStep(t *testing.T) {
363370
"BUILDKITE_BAZEL_CACHE_URL": "https://bazel-build-cache",
364371
"RAYCI_WORK_REPO": "fakeecr",
365372
"RAYCI_BRANCH": "beta",
373+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
366374

367375
"RAYCI_WANDA_FILE": "ci/forge.wanda.yaml",
368376
"RAYCI_WANDA_NAME": "forge",
@@ -402,6 +410,7 @@ func TestConvertPipelineStep(t *testing.T) {
402410
"RAYCI_WORK_REPO": "fakeecr",
403411
"RAYCI_BRANCH": "beta",
404412
"RAYCI_STEP_ID": fakeStepID,
413+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
405414

406415
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
407416
},
@@ -430,6 +439,7 @@ func TestConvertPipelineStep(t *testing.T) {
430439
"RAYCI_WORK_REPO": "fakeecr",
431440
"RAYCI_BRANCH": "beta",
432441
"RAYCI_STEP_ID": fakeStepID,
442+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
433443

434444
"BUILDKITE_ARTIFACT_UPLOAD_DESTINATION": artifactDest,
435445
},
@@ -460,6 +470,7 @@ func TestConvertPipelineStep(t *testing.T) {
460470
"RAYCI_TEMP": "s3://ci-temp/abc123/",
461471
"RAYCI_WORK_REPO": "fakeecr",
462472
"RAYCI_STEP_ID": fakeStepID,
473+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
463474
},
464475
"parallelism": 4,
465476
},
@@ -505,6 +516,7 @@ func TestConvertPipelineStep(t *testing.T) {
505516
"RAYCI_STEP_ID": "fakeid",
506517
"RAYCI_TEMP": "s3://ci-temp/abc123/",
507518
"RAYCI_WORK_REPO": "fakeecr",
519+
"RAYCI_ARTIFACTS_DIR": "/artifact-mount",
508520
},
509521
"label": "say hello [fakeid]",
510522
"command": "echo hello",

0 commit comments

Comments
 (0)