forked from longtao.wu/droboticflow
🗂️ Reorganize BOS workspace layout
This commit is contained in:
parent
d19e3000f8
commit
5289510260
@ -18,7 +18,7 @@ import (
|
||||
|
||||
const (
|
||||
operatorImageArchiveFormMemoryBytes = 32 << 20
|
||||
operatorImageArchiveSubdir = "operator-image-archives"
|
||||
operatorImageArchiveSubdir = "system/builds/operator-archives"
|
||||
registryAuthFilePath = "/kaniko/.docker/config.json"
|
||||
)
|
||||
|
||||
|
||||
@ -84,7 +84,7 @@ type pocOperatorFixtureManifest struct {
|
||||
}
|
||||
|
||||
func (server *server) defaultPocOperatorFixtureManifestPath() string {
|
||||
return path.Join(cleanWorkspaceMountPath(server.workspaceMountPath), "fixtures", "poc-operator-acceptance", "poc-operator-acceptance.json")
|
||||
return path.Join(cleanWorkspaceMountPath(server.workspaceMountPath), "datasets", "fixtures", "poc-operator-acceptance", "poc-operator-acceptance.json")
|
||||
}
|
||||
|
||||
func validatePocOperatorFixtureManifestPath(value string, workspaceMountPath string) (string, *validationIssue) {
|
||||
@ -627,7 +627,7 @@ func workflowNodeFromOperator(operator domain.OperatorRecord, fixtures pocOperat
|
||||
bucket = storageConnection.Bucket
|
||||
if bucket != "" {
|
||||
prefix := strings.TrimPrefix(strings.TrimPrefix(fixtures.XPlatform, fixtures.Root), "/")
|
||||
acceptancePrefix := strings.Trim(path.Join("fixtures", "poc-operator-acceptance", prefix), "/")
|
||||
acceptancePrefix := strings.Trim(path.Join("datasets", "fixtures", "poc-operator-acceptance", prefix), "/")
|
||||
hyperparams = setHyperparam(hyperparams, "SOURCE_PATH", "bos://"+strings.Trim(bucket, "/")+"/"+acceptancePrefix)
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,8 +10,8 @@ import (
|
||||
)
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsRoutesSegmentationFixture(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["segmentation"] = "/workspace/fixtures/poc-operator-acceptance/segmentation"
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["segmentation"] = "/workspace/datasets/fixtures/poc-operator-acceptance/segmentation"
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-segmentation-mask-validate",
|
||||
@ -19,7 +19,7 @@ func TestConfigurePocOperatorHyperparamsRoutesSegmentationFixture(t *testing.T)
|
||||
Type: "builtin",
|
||||
}, fixtures)
|
||||
|
||||
if value := hyperparamValue(params, "SOURCE_PATH"); value != "/workspace/fixtures/poc-operator-acceptance/segmentation" {
|
||||
if value := hyperparamValue(params, "SOURCE_PATH"); value != "/workspace/datasets/fixtures/poc-operator-acceptance/segmentation" {
|
||||
t.Fatalf("SOURCE_PATH = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "MAX_PAIRS"); value != "2" {
|
||||
@ -28,8 +28,8 @@ func TestConfigurePocOperatorHyperparamsRoutesSegmentationFixture(t *testing.T)
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsRoutesTFRecordFixture(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["tfrecord"] = "/workspace/fixtures/poc-operator-acceptance/tfrecord"
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["tfrecord"] = "/workspace/datasets/fixtures/poc-operator-acceptance/tfrecord"
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-tfrecord-structural-validate",
|
||||
@ -37,7 +37,7 @@ func TestConfigurePocOperatorHyperparamsRoutesTFRecordFixture(t *testing.T) {
|
||||
Type: "builtin",
|
||||
}, fixtures)
|
||||
|
||||
if value := hyperparamValue(params, "SOURCE_PATH"); value != "/workspace/fixtures/poc-operator-acceptance/tfrecord" {
|
||||
if value := hyperparamValue(params, "SOURCE_PATH"); value != "/workspace/datasets/fixtures/poc-operator-acceptance/tfrecord" {
|
||||
t.Fatalf("SOURCE_PATH = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "MAX_RECORDS"); value != "10" {
|
||||
@ -64,7 +64,7 @@ func TestConfigurePocOperatorHyperparamsRoutesMongoToPlatform(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsBoundsDatasetSplitManifest(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-dataset-split-manifest",
|
||||
@ -81,7 +81,7 @@ func TestConfigurePocOperatorHyperparamsBoundsDatasetSplitManifest(t *testing.T)
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsBoundsLeRobotVideoAlignment(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-lerobot-video-alignment-validate",
|
||||
@ -100,8 +100,8 @@ func TestConfigurePocOperatorHyperparamsBoundsLeRobotVideoAlignment(t *testing.T
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsRoutesYOLODataYaml(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["yolo_data_yaml"] = "/workspace/fixtures/poc-operator-acceptance/yolo/coco128/data.yaml"
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["yolo_data_yaml"] = "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/coco128/data.yaml"
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-yolo-embodied-detection-train",
|
||||
@ -109,7 +109,7 @@ func TestConfigurePocOperatorHyperparamsRoutesYOLODataYaml(t *testing.T) {
|
||||
Type: "builtin",
|
||||
}, fixtures)
|
||||
|
||||
if value := hyperparamValue(params, "DATA_YAML"); value != "/workspace/fixtures/poc-operator-acceptance/yolo/coco128/data.yaml" {
|
||||
if value := hyperparamValue(params, "DATA_YAML"); value != "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/coco128/data.yaml" {
|
||||
t.Fatalf("DATA_YAML = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "WORKERS"); value != "0" {
|
||||
@ -118,8 +118,8 @@ func TestConfigurePocOperatorHyperparamsRoutesYOLODataYaml(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsRoutesProductionTrainingFixture(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["training_json"] = "/workspace/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["training_json"] = "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-act-policy-train",
|
||||
@ -127,7 +127,7 @@ func TestConfigurePocOperatorHyperparamsRoutesProductionTrainingFixture(t *testi
|
||||
Type: "builtin",
|
||||
}, fixtures)
|
||||
|
||||
if value := hyperparamValue(params, "DATASET_PATH"); value != "/workspace/fixtures/poc-operator-acceptance/json/training-records.json" {
|
||||
if value := hyperparamValue(params, "DATASET_PATH"); value != "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json" {
|
||||
t.Fatalf("DATASET_PATH = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "STATE_FIELD"); value != "state" {
|
||||
@ -142,8 +142,8 @@ func TestConfigurePocOperatorHyperparamsRoutesProductionTrainingFixture(t *testi
|
||||
}
|
||||
|
||||
func TestConfigurePocOperatorHyperparamsRoutesYOLOONNXModel(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["yolo_onnx_model"] = "/workspace/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures.Extra["yolo_onnx_model"] = "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
|
||||
params := configurePocOperatorHyperparams(domain.OperatorRecord{
|
||||
ID: "operator-builtin-yolo-video-target-clip",
|
||||
@ -157,7 +157,7 @@ func TestConfigurePocOperatorHyperparamsRoutesYOLOONNXModel(t *testing.T) {
|
||||
if value := hyperparamValue(params, "DETECTION_MODE"); value != "opencv-dnn" {
|
||||
t.Fatalf("DETECTION_MODE = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "DNN_MODEL_PATH"); value != "/workspace/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx" {
|
||||
if value := hyperparamValue(params, "DNN_MODEL_PATH"); value != "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx" {
|
||||
t.Fatalf("DNN_MODEL_PATH = %q", value)
|
||||
}
|
||||
if value := hyperparamValue(params, "TARGET_LABELS"); value != "*" {
|
||||
@ -170,7 +170,7 @@ func TestConfigurePocOperatorHyperparamsUsesManifestShellCommand(t *testing.T) {
|
||||
ID: "operator-builtin-shell-command",
|
||||
Name: "Shell 命令",
|
||||
Type: "builtin",
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"))
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"))
|
||||
|
||||
if value := hyperparamValue(params, "SCRIPT_ID"); value != "fixture_report" {
|
||||
t.Fatalf("SCRIPT_ID = %q", value)
|
||||
@ -302,7 +302,7 @@ func TestBuildPocOperatorWorkflowInputLimitsAcceptanceConcurrency(t *testing.T)
|
||||
workflow := buildPocOperatorWorkflowInput(project, "数据接入与格式转换链路", []domain.OperatorRecord{
|
||||
{ID: "operator-builtin-json-filter", Name: "JSON 过滤", Type: "builtin"},
|
||||
{ID: "operator-builtin-json-map-rename", Name: "JSON 字段映射", Type: "builtin"},
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"), nil)
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"), nil)
|
||||
|
||||
if workflow.MaxConcurrentRuns != pocOperatorWorkflowAcceptanceMaxConcurrentRuns {
|
||||
t.Fatalf("MaxConcurrentRuns = %d, want %d", workflow.MaxConcurrentRuns, pocOperatorWorkflowAcceptanceMaxConcurrentRuns)
|
||||
@ -315,7 +315,7 @@ func TestBuildPocOperatorWorkflowInputLaysOutSingleHorizontalChain(t *testing.T)
|
||||
{ID: "operator-builtin-json-filter", Name: "JSON 过滤", Type: "builtin"},
|
||||
{ID: "operator-builtin-json-map-rename", Name: "JSON 字段映射", Type: "builtin"},
|
||||
{ID: "operator-builtin-template-render", Name: "文本模板渲染", Type: "builtin"},
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"), nil)
|
||||
}, pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"), nil)
|
||||
|
||||
if len(workflow.Nodes) != 3 {
|
||||
t.Fatalf("nodes = %d, want 3", len(workflow.Nodes))
|
||||
@ -514,7 +514,7 @@ func TestGroupPocOperatorAcceptanceBatchesAddsHumanReviewPackageSupport(t *testi
|
||||
}
|
||||
|
||||
func TestWorkflowNodeFromOperatorScopesBOSScanToAcceptancePrefix(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
connection := &domain.StorageConnectionRecord{
|
||||
ID: "storage-poc-bos-workspace",
|
||||
Bucket: "testxyz",
|
||||
@ -532,7 +532,7 @@ func TestWorkflowNodeFromOperatorScopesBOSScanToAcceptancePrefix(t *testing.T) {
|
||||
if node.Data.Bucket != "testxyz" {
|
||||
t.Fatalf("bucket = %q", node.Data.Bucket)
|
||||
}
|
||||
if value := hyperparamValue(node.Data.Hyperparams, "SOURCE_PATH"); value != "bos://testxyz/fixtures/poc-operator-acceptance/xplatform" {
|
||||
if value := hyperparamValue(node.Data.Hyperparams, "SOURCE_PATH"); value != "bos://testxyz/datasets/fixtures/poc-operator-acceptance/xplatform" {
|
||||
t.Fatalf("SOURCE_PATH = %q", value)
|
||||
}
|
||||
}
|
||||
@ -575,7 +575,7 @@ func TestFirstPocOperatorAcceptanceStorageConnectionRequiresBucket(t *testing.T)
|
||||
}
|
||||
|
||||
func TestWorkflowNodeFromOperatorCopiesDefaultGPUResources(t *testing.T) {
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
fixtures := pocOperatorAcceptanceFixturePathsFromManifest("/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json")
|
||||
node := workflowNodeFromOperator(domain.OperatorRecord{
|
||||
ID: "operator-builtin-act-policy-train",
|
||||
Name: "ACT 策略训练",
|
||||
|
||||
@ -1547,7 +1547,7 @@ func validatePocGPUWorkflowSourcePath(value string, workspaceMountPath string) (
|
||||
}
|
||||
|
||||
func (server *server) defaultPocGPUWorkflowSourcePath() string {
|
||||
return path.Join(cleanWorkspaceMountPath(server.workspaceMountPath), "fixtures", "poc-operator-acceptance", "xplatform")
|
||||
return path.Join(cleanWorkspaceMountPath(server.workspaceMountPath), "datasets", "fixtures", "poc-operator-acceptance", "xplatform")
|
||||
}
|
||||
|
||||
func pocGPUWorkflowNodes(sourcePath string) ([]domain.WorkflowNode, []domain.WorkflowEdge) {
|
||||
|
||||
@ -1633,7 +1633,7 @@ func TestDashboardIncludesPOCGatesFromAcceptanceArtifactAndWorkerCapacity(t *tes
|
||||
NodeID: "poc-acceptance",
|
||||
Name: "poc-operator-full-acceptance-result.json",
|
||||
Type: domain.PortTypeJSON,
|
||||
Path: "/workspace/acceptance/poc-operator-full-acceptance-result.json",
|
||||
Path: "/workspace/system/acceptance/general/poc-operator-full-acceptance-result.json",
|
||||
Data: acceptancePayload,
|
||||
},
|
||||
},
|
||||
@ -1834,7 +1834,7 @@ func TestPocAcceptanceReadinessAllowsSharedAPITokenWhenSessionAuthIsEnabled(t *t
|
||||
NodeID: "poc-acceptance",
|
||||
Name: "poc-operator-full-acceptance-result.json",
|
||||
Type: domain.PortTypeJSON,
|
||||
Path: "/workspace/acceptance/poc-operator-full-acceptance-result.json",
|
||||
Path: "/workspace/system/acceptance/general/poc-operator-full-acceptance-result.json",
|
||||
Data: acceptancePayload,
|
||||
},
|
||||
},
|
||||
@ -3452,7 +3452,7 @@ func TestPocAcceptanceImportCreatesPlatformRunArtifact(t *testing.T) {
|
||||
"result": map[string]any{
|
||||
"runId": "poc-operator-acceptance-20260623010101",
|
||||
"status": "passed",
|
||||
"workspace": "/workspace/acceptance/poc-operator-acceptance-20260623010101",
|
||||
"workspace": "/workspace/system/acceptance/general/poc-operator-acceptance-20260623010101",
|
||||
"acceptanceScope": "dependency-isolation",
|
||||
"fullExternalAcceptance": false,
|
||||
"operatorCount": 28,
|
||||
@ -3677,7 +3677,7 @@ func TestPocGPUWorkflowAcceptanceAllowsSharedAPITokenWhenSessionAuthIsEnabled(t
|
||||
t.Setenv("DROBOTICFLOW_API_TOKEN", "shared-acceptance-token")
|
||||
dataStore := store.NewMemoryStore()
|
||||
handler := NewHandler(dataStore, nil)
|
||||
rawPayload := []byte(`{"sourcePath":"/workspace/fixtures/poc-operator-acceptance/xplatform"}`)
|
||||
rawPayload := []byte(`{"sourcePath":"/workspace/datasets/fixtures/poc-operator-acceptance/xplatform"}`)
|
||||
|
||||
recorder := httptest.NewRecorder()
|
||||
request := httptest.NewRequest(http.MethodPost, "/api/acceptance/poc-gpu-workflow", bytes.NewReader(rawPayload))
|
||||
@ -3718,12 +3718,12 @@ func TestPocGPUWorkflowAcceptanceAllowsSharedAPITokenWhenSessionAuthIsEnabled(t
|
||||
for _, param := range sourceNode.Data.Hyperparams {
|
||||
params[param.Key] = param.Value
|
||||
}
|
||||
if params["DATA_SOURCE"] != "LOCAL" || params["SOURCE_PATH"] != "/workspace/fixtures/poc-operator-acceptance/xplatform" {
|
||||
if params["DATA_SOURCE"] != "LOCAL" || params["SOURCE_PATH"] != "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform" {
|
||||
t.Fatalf("source hyperparams = %+v", params)
|
||||
}
|
||||
|
||||
secondRecorder := httptest.NewRecorder()
|
||||
secondRequest := httptest.NewRequest(http.MethodPost, "/api/acceptance/poc-gpu-workflow", bytes.NewReader([]byte(`{"sourcePath":"/workspace/fixtures/poc-operator-acceptance/xplatform-v2"}`)))
|
||||
secondRequest := httptest.NewRequest(http.MethodPost, "/api/acceptance/poc-gpu-workflow", bytes.NewReader([]byte(`{"sourcePath":"/workspace/datasets/fixtures/poc-operator-acceptance/xplatform-v2"}`)))
|
||||
secondRequest.Header.Set("Authorization", "Bearer shared-acceptance-token")
|
||||
handler.ServeHTTP(secondRecorder, secondRequest)
|
||||
if secondRecorder.Code != http.StatusAccepted {
|
||||
@ -3748,7 +3748,7 @@ func TestPocGPUWorkflowAcceptanceAllowsSharedAPITokenWhenSessionAuthIsEnabled(t
|
||||
for _, param := range secondSourceNode.Data.Hyperparams {
|
||||
secondParams[param.Key] = param.Value
|
||||
}
|
||||
if secondParams["SOURCE_PATH"] != "/workspace/fixtures/poc-operator-acceptance/xplatform-v2" {
|
||||
if secondParams["SOURCE_PATH"] != "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform-v2" {
|
||||
t.Fatalf("second source hyperparams = %+v", secondParams)
|
||||
}
|
||||
projects, err := dataStore.ListProjectsByOrganization(context.Background(), domain.DefaultOrganizationID)
|
||||
@ -3937,12 +3937,12 @@ func pocAcceptanceFixtureSources() map[string]any {
|
||||
return map[string]any{
|
||||
"allowGeneratedFixtures": false,
|
||||
"items": map[string]any{
|
||||
"csv": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/csv/records.csv", "generated": false},
|
||||
"json": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/json/records.json", "generated": false},
|
||||
"lerobot": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/lerobot", "generated": false},
|
||||
"model": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/model/quality-gate.json", "generated": false},
|
||||
"rosbag": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/rosbag", "generated": false},
|
||||
"xplatform": map[string]any{"path": "/workspace/fixtures/poc-operator-acceptance/xplatform", "generated": false},
|
||||
"csv": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv", "generated": false},
|
||||
"json": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/json/records.json", "generated": false},
|
||||
"lerobot": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/lerobot", "generated": false},
|
||||
"model": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/model/quality-gate.json", "generated": false},
|
||||
"rosbag": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/rosbag", "generated": false},
|
||||
"xplatform": map[string]any{"path": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform", "generated": false},
|
||||
},
|
||||
}
|
||||
}
|
||||
@ -4329,8 +4329,8 @@ func TestPocAcceptanceImportRejectsGeneratedFixtureFullAcceptance(t *testing.T)
|
||||
"fixtureSources": map[string]any{
|
||||
"allowGeneratedFixtures": true,
|
||||
"items": map[string]any{
|
||||
"xplatform": map[string]any{"path": "/workspace/acceptance/generated/xplatform", "generated": true},
|
||||
"csv": map[string]any{"path": "/workspace/fixtures/records.csv", "generated": false},
|
||||
"xplatform": map[string]any{"path": "/workspace/system/acceptance/general/generated/xplatform", "generated": true},
|
||||
"csv": map[string]any{"path": "/workspace/datasets/fixtures/records.csv", "generated": false},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@ -292,7 +292,7 @@ func prepareNodeWorkspace(workspaceRoot string, runID string, nodeID string) (no
|
||||
if root == "" {
|
||||
root = filepath.Join(os.TempDir(), "droboticflow")
|
||||
}
|
||||
runRoot := filepath.Join(root, "runs", runID)
|
||||
runRoot := filepath.Join(root, "system", "runs", runID)
|
||||
nodeRoot := filepath.Join(runRoot, "nodes", nodeID)
|
||||
outputDir := filepath.Join(nodeRoot, "outputs")
|
||||
if err := os.MkdirAll(outputDir, 0o755); err != nil {
|
||||
|
||||
@ -36,12 +36,12 @@ func TestBuildNodeEnvInjectsPlatformMongoEnvForMongoNode(t *testing.T) {
|
||||
}
|
||||
|
||||
workspace := nodeWorkspace{
|
||||
RunRoot: "/tmp/workspace/runs/run-1",
|
||||
Root: "/tmp/workspace/runs/run-1/nodes/node-1",
|
||||
OutputDir: "/tmp/workspace/runs/run-1/nodes/node-1/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/runs/run-1/nodes/node-1/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/runs/run-1/nodes/node-1/result.json",
|
||||
StageManifestPath: "/tmp/workspace/runs/run-1/nodes/node-1/stage-manifest.json",
|
||||
RunRoot: "/tmp/workspace/system/runs/run-1",
|
||||
Root: "/tmp/workspace/system/runs/run-1/nodes/node-1",
|
||||
OutputDir: "/tmp/workspace/system/runs/run-1/nodes/node-1/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/system/runs/run-1/nodes/node-1/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/system/runs/run-1/nodes/node-1/result.json",
|
||||
StageManifestPath: "/tmp/workspace/system/runs/run-1/nodes/node-1/stage-manifest.json",
|
||||
}
|
||||
|
||||
env, err := buildNodeEnv(run, workflow, node, nil, workspace, &domain.SettingsRecord{})
|
||||
@ -126,12 +126,12 @@ func TestBuildNodeEnvWritesInputArtifactsManifest(t *testing.T) {
|
||||
}
|
||||
root := t.TempDir()
|
||||
workspace := nodeWorkspace{
|
||||
RunRoot: filepath.Join(root, "runs", "run-1"),
|
||||
Root: filepath.Join(root, "runs", "run-1", "nodes", "node-1"),
|
||||
OutputDir: filepath.Join(root, "runs", "run-1", "nodes", "node-1", "outputs"),
|
||||
InputArtifactsPath: filepath.Join(root, "runs", "run-1", "nodes", "node-1", "input-artifacts.json"),
|
||||
ResultPath: filepath.Join(root, "runs", "run-1", "nodes", "node-1", "result.json"),
|
||||
StageManifestPath: filepath.Join(root, "runs", "run-1", "nodes", "node-1", "stage-manifest.json"),
|
||||
RunRoot: filepath.Join(root, "system", "runs", "run-1"),
|
||||
Root: filepath.Join(root, "system", "runs", "run-1", "nodes", "node-1"),
|
||||
OutputDir: filepath.Join(root, "system", "runs", "run-1", "nodes", "node-1", "outputs"),
|
||||
InputArtifactsPath: filepath.Join(root, "system", "runs", "run-1", "nodes", "node-1", "input-artifacts.json"),
|
||||
ResultPath: filepath.Join(root, "system", "runs", "run-1", "nodes", "node-1", "result.json"),
|
||||
StageManifestPath: filepath.Join(root, "system", "runs", "run-1", "nodes", "node-1", "stage-manifest.json"),
|
||||
}
|
||||
inputs := []domain.ExecutionArtifact{{ID: "artifact-1", Name: "manifest.json", Type: domain.PortTypeJSON, Path: "bos://bucket/demo.json"}}
|
||||
|
||||
@ -227,12 +227,12 @@ func TestBuildNodeEnvDoesNotAllowHyperparamsToOverrideRunTimestampEnv(t *testing
|
||||
},
|
||||
}
|
||||
workspace := nodeWorkspace{
|
||||
RunRoot: "/tmp/workspace/runs/run-2",
|
||||
Root: "/tmp/workspace/runs/run-2/nodes/node-2",
|
||||
OutputDir: "/tmp/workspace/runs/run-2/nodes/node-2/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/runs/run-2/nodes/node-2/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/runs/run-2/nodes/node-2/result.json",
|
||||
StageManifestPath: "/tmp/workspace/runs/run-2/nodes/node-2/stage-manifest.json",
|
||||
RunRoot: "/tmp/workspace/system/runs/run-2",
|
||||
Root: "/tmp/workspace/system/runs/run-2/nodes/node-2",
|
||||
OutputDir: "/tmp/workspace/system/runs/run-2/nodes/node-2/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/system/runs/run-2/nodes/node-2/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/system/runs/run-2/nodes/node-2/result.json",
|
||||
StageManifestPath: "/tmp/workspace/system/runs/run-2/nodes/node-2/stage-manifest.json",
|
||||
}
|
||||
|
||||
env, err := buildNodeEnv(run, workflow, node, nil, workspace, &domain.SettingsRecord{})
|
||||
@ -276,12 +276,12 @@ func TestBuildNodeEnvInjectsProtectedOperatorCommandPolicy(t *testing.T) {
|
||||
},
|
||||
}
|
||||
workspace := nodeWorkspace{
|
||||
RunRoot: "/tmp/workspace/runs/run-3",
|
||||
Root: "/tmp/workspace/runs/run-3/nodes/node-3",
|
||||
OutputDir: "/tmp/workspace/runs/run-3/nodes/node-3/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/runs/run-3/nodes/node-3/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/runs/run-3/nodes/node-3/result.json",
|
||||
StageManifestPath: "/tmp/workspace/runs/run-3/nodes/node-3/stage-manifest.json",
|
||||
RunRoot: "/tmp/workspace/system/runs/run-3",
|
||||
Root: "/tmp/workspace/system/runs/run-3/nodes/node-3",
|
||||
OutputDir: "/tmp/workspace/system/runs/run-3/nodes/node-3/outputs",
|
||||
InputArtifactsPath: "/tmp/workspace/system/runs/run-3/nodes/node-3/input-artifacts.json",
|
||||
ResultPath: "/tmp/workspace/system/runs/run-3/nodes/node-3/result.json",
|
||||
StageManifestPath: "/tmp/workspace/system/runs/run-3/nodes/node-3/stage-manifest.json",
|
||||
}
|
||||
|
||||
env, err := buildNodeEnv(run, workflow, node, nil, workspace, &domain.SettingsRecord{})
|
||||
|
||||
@ -37,7 +37,7 @@ POC_KANIKO_OPERATOR_BASE_IMAGE="${POC_KANIKO_OPERATOR_BASE_IMAGE:-}"
|
||||
POC_KANIKO_OPERATOR_GPU_BASE_IMAGE="${POC_KANIKO_OPERATOR_GPU_BASE_IMAGE:-}"
|
||||
POC_KANIKO_OPERATOR_HOLOBRAIN_BASE_IMAGE="${POC_KANIKO_OPERATOR_HOLOBRAIN_BASE_IMAGE:-}"
|
||||
POC_KANIKO_OPERATOR_YOLO_BASE_IMAGE="${POC_KANIKO_OPERATOR_YOLO_BASE_IMAGE:-}"
|
||||
POC_BUILD_CONTEXT_ROOT="${POC_BUILD_CONTEXT_ROOT:-$WORKSPACE_MOUNT_PATH/build-contexts}"
|
||||
POC_BUILD_CONTEXT_ROOT="${POC_BUILD_CONTEXT_ROOT:-$WORKSPACE_MOUNT_PATH/system/builds/contexts}"
|
||||
|
||||
if [[ -z "${IMAGE_TAG:-}" ]]; then
|
||||
IMAGE_TAG="$(git -C "$ROOT_DIR" rev-parse --short HEAD)-${DEPLOY_ENV:-poc}-$(date +%Y%m%d%H%M%S)"
|
||||
|
||||
@ -15,7 +15,7 @@ source "$ROOT_DIR/scripts/load-deploy-env.sh"
|
||||
|
||||
K8S_NAMESPACE="${K8S_NAMESPACE:-droboticflow}"
|
||||
WORKSPACE_MOUNT_PATH="${WORKSPACE_MOUNT_PATH:-/workspace}"
|
||||
POC_ACCEPTANCE_FIXTURE_TARGET_DIR="${POC_ACCEPTANCE_FIXTURE_TARGET_DIR:-$WORKSPACE_MOUNT_PATH/fixtures/poc-operator-acceptance}"
|
||||
POC_ACCEPTANCE_FIXTURE_TARGET_DIR="${POC_ACCEPTANCE_FIXTURE_TARGET_DIR:-$WORKSPACE_MOUNT_PATH/datasets/fixtures/poc-operator-acceptance}"
|
||||
POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH="${POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH:-$POC_ACCEPTANCE_FIXTURE_TARGET_DIR/poc-operator-acceptance.json}"
|
||||
POC_ACCEPTANCE_FIXTURE_DRY_RUN="${POC_ACCEPTANCE_FIXTURE_DRY_RUN:-false}"
|
||||
|
||||
|
||||
@ -12,9 +12,9 @@ from typing import Any
|
||||
|
||||
DEFAULT_NAMESPACE = "droboticflow"
|
||||
DEFAULT_WORKSPACE = "/workspace"
|
||||
DEFAULT_MANIFEST_PATH = "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
DEFAULT_MANIFEST_PATH = "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
DEFAULT_DISCOVERY_ROOTS = (
|
||||
"/workspace/fixtures",
|
||||
"/workspace/datasets/fixtures",
|
||||
"/workspace/datasets",
|
||||
"/workspace/source-data",
|
||||
"/workspace/imports",
|
||||
@ -22,12 +22,12 @@ DEFAULT_DISCOVERY_ROOTS = (
|
||||
"/workspace",
|
||||
)
|
||||
DEFAULT_EXCLUDE_ROOTS = (
|
||||
"/workspace/acceptance",
|
||||
"/workspace/droboticflow-acceptance",
|
||||
"/workspace/build-contexts",
|
||||
"/workspace/image-builds",
|
||||
"/workspace/system/acceptance/general",
|
||||
"/workspace/system/acceptance/droboticflow",
|
||||
"/workspace/system/builds/contexts",
|
||||
"/workspace/system/builds/images",
|
||||
"/workspace/poc-workflow-acceptance-*",
|
||||
"/workspace/runs",
|
||||
"/workspace/system/runs",
|
||||
)
|
||||
MANIFEST_FIXTURE_PATHS = {
|
||||
"xplatform": ("dir", (("fixtures", "xplatform"), ("fixtures", "xplatformSourcePath"), ("xplatform", "sourcePath"))),
|
||||
@ -82,7 +82,15 @@ def default_exclude_roots(workspace_mount: str, include_acceptance_output: bool)
|
||||
workspace_mount = workspace_mount.rstrip("/") or "/"
|
||||
roots = [workspace_mount + item[len(DEFAULT_WORKSPACE) :] for item in DEFAULT_EXCLUDE_ROOTS]
|
||||
if include_acceptance_output:
|
||||
roots = [item for item in roots if item not in {workspace_mount + "/acceptance", workspace_mount + "/droboticflow-acceptance"}]
|
||||
roots = [
|
||||
item
|
||||
for item in roots
|
||||
if item
|
||||
not in {
|
||||
workspace_mount + "/system/acceptance/general",
|
||||
workspace_mount + "/system/acceptance/droboticflow",
|
||||
}
|
||||
]
|
||||
return roots
|
||||
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ print(hosts[0])
|
||||
export API_BASE_URL="http://${public_host}"
|
||||
fi
|
||||
|
||||
export WORKFLOW_ACCEPTANCE_SOURCE_PATH="${POC_GPU_WORKFLOW_SOURCE_PATH:-${WORKFLOW_ACCEPTANCE_SOURCE_PATH:-/workspace/fixtures/poc-operator-acceptance/xplatform}}"
|
||||
export WORKFLOW_ACCEPTANCE_SOURCE_PATH="${POC_GPU_WORKFLOW_SOURCE_PATH:-${WORKFLOW_ACCEPTANCE_SOURCE_PATH:-/workspace/datasets/fixtures/poc-operator-acceptance/xplatform}}"
|
||||
export WORKFLOW_ACCEPTANCE_GPU_LIMIT="${WORKFLOW_ACCEPTANCE_GPU_LIMIT:-1}"
|
||||
POC_GPU_WORKFLOW_EXPECT_AVAILABLE="$(normalize_bool "POC_GPU_WORKFLOW_EXPECT_AVAILABLE" "${POC_GPU_WORKFLOW_EXPECT_AVAILABLE:-${POC_GPU_CAPACITY_EXPECT_AVAILABLE:-true}}")"
|
||||
if [[ "$POC_GPU_WORKFLOW_EXPECT_AVAILABLE" == "true" ]]; then
|
||||
|
||||
@ -539,7 +539,7 @@ WORKSPACE_MOUNT_PATH="${WORKSPACE_MOUNT_PATH:-$(config_value WORKSPACE_MOUNT_PAT
|
||||
K8S_IMAGE_PULL_SECRET_NAME="${K8S_IMAGE_PULL_SECRET_NAME:-$(config_value K8S_IMAGE_PULL_SECRET_NAME)}"
|
||||
BOS_ENDPOINT="${POC_ACCEPTANCE_BOS_ENDPOINT:-${BOS_ENDPOINT:-$(config_value BOS_ENDPOINT)}}"
|
||||
POC_ACCEPTANCE_BOS_BUCKET="${POC_ACCEPTANCE_BOS_BUCKET:-$(infer_workspace_bucket)}"
|
||||
POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH="${POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH:-${WORKSPACE_MOUNT_PATH%/}/fixtures/poc-operator-acceptance/poc-operator-acceptance.json}"
|
||||
POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH="${POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH:-${WORKSPACE_MOUNT_PATH%/}/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json}"
|
||||
|
||||
validate_image_reference OPERATOR_RUNNER_IMAGE "$OPERATOR_RUNNER_IMAGE"
|
||||
validate_dns_label WORKSPACE_PVC_NAME "$WORKSPACE_PVC_NAME"
|
||||
|
||||
@ -16,7 +16,7 @@ WORKER_SERVICE_PORT="${POC_OPERATOR_WORKFLOW_WORKER_SERVICE_PORT:-3002}"
|
||||
API_TOKEN_SECRET_NAME="${POC_OPERATOR_WORKFLOW_API_TOKEN_SECRET_NAME:-droboticflow-auth-secret}"
|
||||
API_TOKEN_SECRET_KEY="${POC_OPERATOR_WORKFLOW_API_TOKEN_SECRET_KEY:-DROBOTICFLOW_API_TOKEN}"
|
||||
POC_OPERATOR_WORKFLOW_RUN_TIMEOUT_SECONDS="${POC_OPERATOR_WORKFLOW_RUN_TIMEOUT_SECONDS:-5400}"
|
||||
POC_OPERATOR_WORKFLOW_FIXTURE_MANIFEST_PATH="${POC_OPERATOR_WORKFLOW_FIXTURE_MANIFEST_PATH:-/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json}"
|
||||
POC_OPERATOR_WORKFLOW_FIXTURE_MANIFEST_PATH="${POC_OPERATOR_WORKFLOW_FIXTURE_MANIFEST_PATH:-/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json}"
|
||||
POC_OPERATOR_WORKFLOW_MIN_OPERATOR_COUNT="${POC_OPERATOR_WORKFLOW_MIN_OPERATOR_COUNT:-96}"
|
||||
POC_OPERATOR_WORKFLOW_PROCESS_ONCE_TIMEOUT_SECONDS="${POC_OPERATOR_WORKFLOW_PROCESS_ONCE_TIMEOUT_SECONDS:-15}"
|
||||
DROBOTICFLOW_ACCEPTANCE_EMAIL="${DROBOTICFLOW_ACCEPTANCE_EMAIL:-poc-acceptance-admin@droboticflow.local}"
|
||||
|
||||
@ -18,7 +18,7 @@ from typing import Any
|
||||
|
||||
DEFAULT_NAMESPACE = "droboticflow"
|
||||
DEFAULT_WORKSPACE_MOUNT_PATH = "/workspace"
|
||||
DEFAULT_FIXTURE_MANIFEST_RELATIVE_PATH = "fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
DEFAULT_FIXTURE_MANIFEST_RELATIVE_PATH = "datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
DEFAULT_GPU_CAPACITY_WORKER_URL = "http://droboticflow-worker:3002/worker-api/capacity"
|
||||
DEFAULT_GPU_CAPACITY_SERVICE_NAME = "droboticflow-worker"
|
||||
DEFAULT_GPU_CAPACITY_SERVICE_PORT = 3002
|
||||
|
||||
@ -1416,7 +1416,7 @@ def run_acceptance() -> dict[str, Any]:
|
||||
|
||||
bos = bos_config()
|
||||
if all(bos.values()):
|
||||
bos_prefix = f"droboticflow-acceptance/{run_id}"
|
||||
bos_prefix = f"system/acceptance/droboticflow/{run_id}"
|
||||
seed_artifact = json_artifact(
|
||||
run_id,
|
||||
"bos-seed",
|
||||
|
||||
@ -167,7 +167,7 @@ def test_poc_kaniko_build_creates_three_jobs_with_registry_mirror(tmp_path):
|
||||
assert "OPERATOR_RUNNER_IMAGE=registry.example.com/dataflow-poc/droboticflow-operator-runner:ce9b6a1-poc-20260623135924" in result.stdout
|
||||
|
||||
calls = calls_path.read_text(encoding="utf-8")
|
||||
assert "-n droboticflow exec -i droboticflow-api-test -- tar -xf - -C /workspace/build-contexts/droboticflow-ce9b6a1-poc-20260623135924" in calls
|
||||
assert "-n droboticflow exec -i droboticflow-api-test -- tar -xf - -C /workspace/system/builds/contexts/droboticflow-ce9b6a1-poc-20260623135924" in calls
|
||||
assert calls.count("wait --for=condition=complete") == 3
|
||||
|
||||
manifests = "\n---\n".join(path.read_text(encoding="utf-8") for path in sorted(applied_dir.glob("*.yaml")))
|
||||
@ -292,7 +292,7 @@ def test_poc_kaniko_build_cleans_uploaded_context_when_job_fails(tmp_path):
|
||||
assert result.returncode == 1
|
||||
calls = calls_path.read_text(encoding="utf-8").splitlines()
|
||||
assert (
|
||||
'-n droboticflow exec droboticflow-api-test -- sh -lc rm -rf "/workspace/build-contexts/droboticflow-ce9b6a1-poc-20260623135924"'
|
||||
'-n droboticflow exec droboticflow-api-test -- sh -lc rm -rf "/workspace/system/builds/contexts/droboticflow-ce9b6a1-poc-20260623135924"'
|
||||
in calls
|
||||
)
|
||||
|
||||
@ -315,6 +315,6 @@ def test_poc_kaniko_build_cleanup_timeout_does_not_block_success(tmp_path):
|
||||
assert "warning: timed out after 1s while cleaning Kaniko build context" in result.stderr
|
||||
calls = calls_path.read_text(encoding="utf-8").splitlines()
|
||||
assert (
|
||||
'-n droboticflow exec droboticflow-api-test -- sh -lc rm -rf "/workspace/build-contexts/droboticflow-ce9b6a1-poc-20260623135924"'
|
||||
'-n droboticflow exec droboticflow-api-test -- sh -lc rm -rf "/workspace/system/builds/contexts/droboticflow-ce9b6a1-poc-20260623135924"'
|
||||
in calls
|
||||
)
|
||||
|
||||
@ -147,7 +147,7 @@ def fixture_env(paths: dict[str, pathlib.Path]) -> dict[str, str]:
|
||||
"POC_ACCEPTANCE_LOCAL_LEROBOT_SOURCE_PATH": str(paths["lerobot"]),
|
||||
"POC_ACCEPTANCE_LOCAL_ROSBAG_SOURCE_PATH": str(paths["rosbag"]),
|
||||
"POC_ACCEPTANCE_LOCAL_MODEL_JSON_PATH": str(paths["model"]),
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/fixtures/real-fixtures/check.py",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/datasets/fixtures/real-fixtures/check.py",
|
||||
}
|
||||
|
||||
|
||||
@ -172,7 +172,7 @@ def test_configure_poc_acceptance_fixtures_dry_run_does_not_touch_kubectl(tmp_pa
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
assert "POC acceptance fixture dry-run" in result.stdout
|
||||
assert "manifest=/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stdout
|
||||
assert "manifest=/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stdout
|
||||
assert "shellCommandConfigured=true" in result.stdout
|
||||
assert not calls_path.exists()
|
||||
|
||||
@ -190,23 +190,23 @@ def test_configure_poc_acceptance_fixtures_copies_real_inputs_and_writes_manifes
|
||||
result, calls_path, remote_root = run_script(tmp_path, env)
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
assert "POC acceptance fixtures applied: namespace=droboticflow manifest=/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stdout
|
||||
assert 'export POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH="/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"' in result.stdout
|
||||
manifest_path = remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "poc-operator-acceptance.json"
|
||||
assert "POC acceptance fixtures applied: namespace=droboticflow manifest=/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stdout
|
||||
assert 'export POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH="/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"' in result.stdout
|
||||
manifest_path = remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "poc-operator-acceptance.json"
|
||||
manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
|
||||
assert manifest["fixtures"] == {
|
||||
"xplatform": "/workspace/fixtures/poc-operator-acceptance/xplatform",
|
||||
"csv": "/workspace/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"json": "/workspace/fixtures/poc-operator-acceptance/json/records.json",
|
||||
"lerobot": "/workspace/fixtures/poc-operator-acceptance/lerobot",
|
||||
"rosbag": "/workspace/fixtures/poc-operator-acceptance/rosbag",
|
||||
"model": "/workspace/fixtures/poc-operator-acceptance/model/model.json",
|
||||
"xplatform": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform",
|
||||
"csv": "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"json": "/workspace/datasets/fixtures/poc-operator-acceptance/json/records.json",
|
||||
"lerobot": "/workspace/datasets/fixtures/poc-operator-acceptance/lerobot",
|
||||
"rosbag": "/workspace/datasets/fixtures/poc-operator-acceptance/rosbag",
|
||||
"model": "/workspace/datasets/fixtures/poc-operator-acceptance/model/model.json",
|
||||
}
|
||||
assert manifest["shellCommand"] == "python3 /workspace/fixtures/real-fixtures/check.py"
|
||||
assert manifest["shellCommand"] == "python3 /workspace/datasets/fixtures/real-fixtures/check.py"
|
||||
assert manifest["json"]["fieldMap"] == {"status": "decision"}
|
||||
assert manifest["audit"]["rules"][0]["samplePercent"] == 100
|
||||
assert (remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "xplatform" / "marker.txt").read_text(encoding="utf-8") == "xplatform"
|
||||
assert (remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "csv" / "records.csv").is_file()
|
||||
assert (remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "xplatform" / "marker.txt").read_text(encoding="utf-8") == "xplatform"
|
||||
assert (remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "csv" / "records.csv").is_file()
|
||||
assert "get namespace droboticflow" in calls_path.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
@ -221,16 +221,16 @@ def test_configure_poc_acceptance_fixtures_writes_training_and_yolo_model_paths(
|
||||
result, _calls_path, remote_root = run_script(tmp_path, env)
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
manifest_path = remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "poc-operator-acceptance.json"
|
||||
manifest_path = remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "poc-operator-acceptance.json"
|
||||
manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
|
||||
assert manifest["fixtures"]["training_json"] == "/workspace/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["policy_training_json"] == "/workspace/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["vla_training_json"] == "/workspace/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["openvla_training_json"] == "/workspace/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["yolo_onnx_model"] == "/workspace/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
assert manifest["fixtures"]["dnn_model_path"] == "/workspace/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
assert (remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "json" / "training-records.json").is_file()
|
||||
assert (remote_root / "workspace" / "fixtures" / "poc-operator-acceptance" / "yolo" / "models" / "yolov8n.onnx").is_file()
|
||||
assert manifest["fixtures"]["training_json"] == "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["policy_training_json"] == "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["vla_training_json"] == "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["openvla_training_json"] == "/workspace/datasets/fixtures/poc-operator-acceptance/json/training-records.json"
|
||||
assert manifest["fixtures"]["yolo_onnx_model"] == "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
assert manifest["fixtures"]["dnn_model_path"] == "/workspace/datasets/fixtures/poc-operator-acceptance/yolo/models/yolov8n.onnx"
|
||||
assert (remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "json" / "training-records.json").is_file()
|
||||
assert (remote_root / "workspace" / "datasets" / "fixtures" / "poc-operator-acceptance" / "yolo" / "models" / "yolov8n.onnx").is_file()
|
||||
|
||||
|
||||
def test_configure_poc_acceptance_fixtures_rejects_local_file_names_that_escape_workspace(tmp_path):
|
||||
|
||||
@ -52,7 +52,7 @@ def write_fake_kubectl(tmp_path: pathlib.Path, remote_root: pathlib.Path) -> pat
|
||||
return fake_bin
|
||||
|
||||
|
||||
def make_real_fixture_tree(remote_root: pathlib.Path, base: str = "/workspace/fixtures/real") -> dict[str, str]:
|
||||
def make_real_fixture_tree(remote_root: pathlib.Path, base: str = "/workspace/datasets/fixtures/real") -> dict[str, str]:
|
||||
root = remote_root / base.lstrip("/")
|
||||
xplatform = root / "xplatform" / "BJ_001_0001_OsmoNano_2026-03-19_14-51-43"
|
||||
(xplatform / "DJI_001").mkdir(parents=True)
|
||||
@ -127,18 +127,18 @@ def test_fixture_discovery_finds_real_candidates_but_requires_shell_command(tmp_
|
||||
remote_root = tmp_path / "remote"
|
||||
make_real_fixture_tree(remote_root)
|
||||
|
||||
result = run_script(tmp_path, remote_root, {"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures"})
|
||||
result = run_script(tmp_path, remote_root, {"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures"})
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
payload = parse_payload(result)
|
||||
assert payload["status"] == "incomplete"
|
||||
assert payload["excludedRoots"] == [
|
||||
"/workspace/acceptance",
|
||||
"/workspace/droboticflow-acceptance",
|
||||
"/workspace/build-contexts",
|
||||
"/workspace/image-builds",
|
||||
"/workspace/system/acceptance/general",
|
||||
"/workspace/system/acceptance/droboticflow",
|
||||
"/workspace/system/builds/contexts",
|
||||
"/workspace/system/builds/images",
|
||||
"/workspace/poc-workflow-acceptance-*",
|
||||
"/workspace/runs",
|
||||
"/workspace/system/runs",
|
||||
]
|
||||
assert payload["missing"] == ["shellCommand"]
|
||||
assert set(payload["selected"]) == {"xplatform", "csv", "json", "lerobot", "rosbag", "model"}
|
||||
@ -149,10 +149,10 @@ def test_fixture_discovery_finds_real_candidates_but_requires_shell_command(tmp_
|
||||
def test_fixture_discovery_reuses_existing_manifest_shell_command_and_paths(tmp_path):
|
||||
remote_root = tmp_path / "remote"
|
||||
expected = make_real_fixture_tree(remote_root)
|
||||
manifest_path = "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
manifest_path = "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
manifest = {
|
||||
"fixtures": expected,
|
||||
"shellCommand": "python3 /workspace/fixtures/real/check.py",
|
||||
"shellCommand": "python3 /workspace/datasets/fixtures/real/check.py",
|
||||
}
|
||||
target = remote_root / manifest_path.lstrip("/")
|
||||
target.parent.mkdir(parents=True)
|
||||
@ -162,7 +162,7 @@ def test_fixture_discovery_reuses_existing_manifest_shell_command_and_paths(tmp_
|
||||
tmp_path,
|
||||
remote_root,
|
||||
{
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": manifest_path,
|
||||
},
|
||||
)
|
||||
@ -172,7 +172,7 @@ def test_fixture_discovery_reuses_existing_manifest_shell_command_and_paths(tmp_
|
||||
assert payload["status"] == "ready"
|
||||
assert payload["missing"] == []
|
||||
assert payload["manifestSource"] == "existing"
|
||||
assert payload["manifest"]["shellCommand"] == "python3 /workspace/fixtures/real/check.py"
|
||||
assert payload["manifest"]["shellCommand"] == "python3 /workspace/datasets/fixtures/real/check.py"
|
||||
assert payload["manifest"]["fixtures"] == expected
|
||||
assert payload["selected"]["csv"]["evidence"]["source"] == "manifest"
|
||||
assert payload["nextActions"] == []
|
||||
@ -181,15 +181,15 @@ def test_fixture_discovery_reuses_existing_manifest_shell_command_and_paths(tmp_
|
||||
def test_fixture_discovery_writes_manifest_when_all_real_inputs_are_ready(tmp_path):
|
||||
remote_root = tmp_path / "remote"
|
||||
expected = make_real_fixture_tree(remote_root)
|
||||
manifest_path = "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
manifest_path = "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
|
||||
result = run_script(
|
||||
tmp_path,
|
||||
remote_root,
|
||||
{
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": manifest_path,
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/fixtures/real/check.py",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/datasets/fixtures/real/check.py",
|
||||
},
|
||||
"--write-manifest",
|
||||
)
|
||||
@ -200,19 +200,19 @@ def test_fixture_discovery_writes_manifest_when_all_real_inputs_are_ready(tmp_pa
|
||||
assert payload["writeResult"] == "written"
|
||||
written = json.loads((remote_root / manifest_path.lstrip("/")).read_text(encoding="utf-8"))
|
||||
assert written["fixtures"] == expected
|
||||
assert written["shellCommand"] == "python3 /workspace/fixtures/real/check.py"
|
||||
assert written["shellCommand"] == "python3 /workspace/datasets/fixtures/real/check.py"
|
||||
|
||||
|
||||
def test_fixture_discovery_excludes_acceptance_outputs_by_default(tmp_path):
|
||||
remote_root = tmp_path / "remote"
|
||||
make_real_fixture_tree(remote_root, base="/workspace/acceptance/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/system/acceptance/general/generated")
|
||||
|
||||
result = run_script(
|
||||
tmp_path,
|
||||
remote_root,
|
||||
{
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/acceptance/generated/check.py",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/system/acceptance/general/generated/check.py",
|
||||
},
|
||||
)
|
||||
|
||||
@ -225,18 +225,18 @@ def test_fixture_discovery_excludes_acceptance_outputs_by_default(tmp_path):
|
||||
|
||||
def test_fixture_discovery_excludes_generated_runs_and_build_contexts_by_default(tmp_path):
|
||||
remote_root = tmp_path / "remote"
|
||||
make_real_fixture_tree(remote_root, base="/workspace/runs/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/build-contexts/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/image-builds/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/system/runs/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/system/builds/contexts/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/system/builds/images/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/poc-workflow-acceptance-20260622220648/source")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/droboticflow-acceptance/generated")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/system/acceptance/droboticflow/generated")
|
||||
|
||||
result = run_script(
|
||||
tmp_path,
|
||||
remote_root,
|
||||
{
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/runs/generated/check.py",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/system/runs/generated/check.py",
|
||||
},
|
||||
)
|
||||
|
||||
@ -249,7 +249,7 @@ def test_fixture_discovery_excludes_generated_runs_and_build_contexts_by_default
|
||||
|
||||
def test_fixture_discovery_custom_exclude_roots_can_target_large_non_fixture_trees(tmp_path):
|
||||
remote_root = tmp_path / "remote"
|
||||
make_real_fixture_tree(remote_root, base="/workspace/fixtures/real")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/datasets/fixtures/real")
|
||||
make_real_fixture_tree(remote_root, base="/workspace/archive/not-final")
|
||||
|
||||
result = run_script(
|
||||
@ -258,7 +258,7 @@ def test_fixture_discovery_custom_exclude_roots_can_target_large_non_fixture_tre
|
||||
{
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace",
|
||||
"POC_ACCEPTANCE_DISCOVERY_EXCLUDE_ROOTS": "/workspace/archive",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/fixtures/real/check.py",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/datasets/fixtures/real/check.py",
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@ -28,17 +28,17 @@ DEFAULT_WORKSPACE_MOUNT_PATH = "/workspace"
|
||||
|
||||
|
||||
def default_manifest_path(workspace_mount_path: str = DEFAULT_WORKSPACE_MOUNT_PATH) -> str:
|
||||
return f"{workspace_mount_path}/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
return f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
|
||||
|
||||
def default_fixture_paths(workspace_mount_path: str = DEFAULT_WORKSPACE_MOUNT_PATH) -> dict[str, str]:
|
||||
return {
|
||||
"xplatform": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/xplatform",
|
||||
"csv": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"json": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/json/records.json",
|
||||
"lerobot": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/lerobot",
|
||||
"rosbag": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/rosbag",
|
||||
"model": f"{workspace_mount_path}/fixtures/poc-operator-acceptance/model/model.json",
|
||||
"xplatform": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/xplatform",
|
||||
"csv": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"json": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/json/records.json",
|
||||
"lerobot": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/lerobot",
|
||||
"rosbag": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/rosbag",
|
||||
"model": f"{workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/model/model.json",
|
||||
}
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ def available_gpu_capacity_payload() -> dict:
|
||||
def complete_manifest(workspace_mount_path: str = DEFAULT_WORKSPACE_MOUNT_PATH) -> dict:
|
||||
return {
|
||||
"fixtures": default_fixture_paths(workspace_mount_path),
|
||||
"shellCommand": f"python3 {workspace_mount_path}/fixtures/poc-operator-acceptance/check.py",
|
||||
"shellCommand": f"python3 {workspace_mount_path}/datasets/fixtures/poc-operator-acceptance/check.py",
|
||||
}
|
||||
|
||||
|
||||
@ -590,7 +590,7 @@ def test_poc_acceptance_readiness_rejects_manifest_outside_workspace_mount(tmp_p
|
||||
tmp_path,
|
||||
dcloud_secret=complete_secret(),
|
||||
manifest_exists=True,
|
||||
extra_env={"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"},
|
||||
extra_env={"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"},
|
||||
workspace_mount_path="/mnt/shared",
|
||||
)
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ print(json.dumps(payload, separators=(",", ":")))
|
||||
"K8S_NAMESPACE": "droboticflow",
|
||||
"PATH": f"{stub_bin}{os.pathsep}{env.get('PATH', '')}",
|
||||
"POC_GPU_WORKFLOW_EXPECT_AVAILABLE": "false",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/fixtures/poc-operator-acceptance/xplatform",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform",
|
||||
"WORKFLOW_ACCEPTANCE_RUN_TIMEOUT_SECONDS": "1",
|
||||
}
|
||||
)
|
||||
@ -210,7 +210,7 @@ print(json.dumps(payload, separators=(",", ":")))
|
||||
"K8S_NAMESPACE": "droboticflow",
|
||||
"PATH": f"{stub_bin}{os.pathsep}{env.get('PATH', '')}",
|
||||
"POC_GPU_WORKFLOW_EXPECT_AVAILABLE": "false",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/fixtures/poc-operator-acceptance/xplatform",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform",
|
||||
"WORKFLOW_ACCEPTANCE_RUN_TIMEOUT_SECONDS": "1",
|
||||
}
|
||||
)
|
||||
@ -227,7 +227,7 @@ print(json.dumps(payload, separators=(",", ":")))
|
||||
assert "worker port-forward:" in result.stdout
|
||||
assert "run status: failed" in result.stdout
|
||||
body = json.loads(captured_acceptance.read_text(encoding="utf-8"))
|
||||
assert body == {"sourcePath": "/workspace/fixtures/poc-operator-acceptance/xplatform"}
|
||||
assert body == {"sourcePath": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform"}
|
||||
|
||||
|
||||
def test_poc_gpu_workflow_acceptance_can_expect_completed_gpu_run(tmp_path):
|
||||
@ -313,7 +313,7 @@ print(json.dumps(payload, separators=(",", ":")))
|
||||
"K8S_NAMESPACE": "droboticflow",
|
||||
"PATH": f"{stub_bin}{os.pathsep}{env.get('PATH', '')}",
|
||||
"POC_GPU_WORKFLOW_EXPECT_AVAILABLE": "true",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/fixtures/poc-operator-acceptance/xplatform",
|
||||
"POC_GPU_WORKFLOW_SOURCE_PATH": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform",
|
||||
"WORKFLOW_ACCEPTANCE_RUN_TIMEOUT_SECONDS": "1",
|
||||
}
|
||||
)
|
||||
@ -329,4 +329,4 @@ print(json.dumps(payload, separators=(",", ":")))
|
||||
assert "run status: completed" in result.stdout
|
||||
assert "artifacts summary:" in result.stdout
|
||||
body = json.loads(captured_acceptance.read_text(encoding="utf-8"))
|
||||
assert body == {"sourcePath": "/workspace/fixtures/poc-operator-acceptance/xplatform"}
|
||||
assert body == {"sourcePath": "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform"}
|
||||
|
||||
@ -259,7 +259,7 @@ def test_prepare_acceptance_inputs_accepts_fixture_manifest(tmp_path, monkeypatc
|
||||
"filterField": "status",
|
||||
"fieldMap": {"status": "decision"}
|
||||
},
|
||||
"shellCommand": "python3 /workspace/fixtures/acceptance.py"
|
||||
"shellCommand": "python3 /workspace/datasets/fixtures/acceptance.py"
|
||||
}"""
|
||||
% (xplatform, csv_path, json_path, lerobot, rosbag, model_path),
|
||||
encoding="utf-8",
|
||||
@ -275,7 +275,7 @@ def test_prepare_acceptance_inputs_accepts_fixture_manifest(tmp_path, monkeypatc
|
||||
assert payload["fixtureSources"]["fixtureManifestPath"] == str(manifest_path)
|
||||
assert module.env_text("POC_ACCEPTANCE_JSON_FILTER_FIELD") == "status"
|
||||
assert module.env_text("POC_ACCEPTANCE_JSON_FIELD_MAP_JSON") == '{"status":"decision"}'
|
||||
assert module.env_text("POC_ACCEPTANCE_SHELL_COMMAND") == "python3 /workspace/fixtures/acceptance.py"
|
||||
assert module.env_text("POC_ACCEPTANCE_SHELL_COMMAND") == "python3 /workspace/datasets/fixtures/acceptance.py"
|
||||
assert all(not item["generated"] for item in payload["fixtureSources"]["items"].values())
|
||||
assert module.fixture_source_counts(payload["fixtureSources"]) == {
|
||||
"generatedFixtureCount": 0,
|
||||
|
||||
@ -351,7 +351,7 @@ def run_script_with_missing_dcloud_secret(
|
||||
"POC_ACCEPTANCE_BOS_ENDPOINT": "https://bj.bcebos.com",
|
||||
"POC_ACCEPTANCE_DCLOUD_SECRET_NAME": "droboticflow-dcloud-secret",
|
||||
"POC_ACCEPTANCE_REQUIRED_EXTERNALS": "bos,dcloud,mongo",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures",
|
||||
}
|
||||
)
|
||||
if extra_env:
|
||||
@ -416,7 +416,7 @@ def run_script_with_incomplete_dcloud_secret(
|
||||
"POC_ACCEPTANCE_DCLOUD_SECRET_NAME": "droboticflow-dcloud-secret",
|
||||
"POC_ACCEPTANCE_REQUIRED_EXTERNALS": "bos,dcloud,mongo",
|
||||
"POC_ACCEPTANCE_IMPORT_RESULT": "false",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures",
|
||||
}
|
||||
)
|
||||
if extra_env:
|
||||
@ -481,7 +481,7 @@ def run_script_with_complete_dcloud_secret(
|
||||
"POC_ACCEPTANCE_DCLOUD_SECRET_NAME": "droboticflow-dcloud-secret",
|
||||
"POC_ACCEPTANCE_REQUIRED_EXTERNALS": "bos,dcloud,mongo",
|
||||
"POC_ACCEPTANCE_IMPORT_RESULT": "false",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/fixtures",
|
||||
"POC_ACCEPTANCE_DISCOVERY_ROOTS": "/workspace/datasets/fixtures",
|
||||
}
|
||||
)
|
||||
if extra_env:
|
||||
@ -505,14 +505,14 @@ def assert_fixture_discovery_summary(payload: dict[str, object], record_index: i
|
||||
discovery = evidence["fixtureDiscovery"]
|
||||
assert isinstance(discovery, dict)
|
||||
assert discovery["status"] == "incomplete"
|
||||
assert discovery["roots"] == ["/workspace/fixtures"]
|
||||
assert discovery["roots"] == ["/workspace/datasets/fixtures"]
|
||||
assert discovery["excludedRoots"] == [
|
||||
"/workspace/acceptance",
|
||||
"/workspace/droboticflow-acceptance",
|
||||
"/workspace/build-contexts",
|
||||
"/workspace/image-builds",
|
||||
"/workspace/system/acceptance/general",
|
||||
"/workspace/system/acceptance/droboticflow",
|
||||
"/workspace/system/builds/contexts",
|
||||
"/workspace/system/builds/images",
|
||||
"/workspace/poc-workflow-acceptance-*",
|
||||
"/workspace/runs",
|
||||
"/workspace/system/runs",
|
||||
]
|
||||
assert discovery["candidateCounts"] == {
|
||||
"csv": 0,
|
||||
@ -565,7 +565,7 @@ def test_poc_operator_acceptance_renders_strict_poc_job_manifest():
|
||||
assert 'value: "false"' in result.stdout
|
||||
assert "name: POC_ACCEPTANCE_ALLOW_GENERATED_FIXTURES" in result.stdout
|
||||
assert "name: POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH" in result.stdout
|
||||
assert 'value: "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"' in result.stdout
|
||||
assert "name: POC_ACCEPTANCE_XPLATFORM_SOURCE_PATH" in result.stdout
|
||||
assert "name: POC_ACCEPTANCE_CSV_INPUT_PATH" in result.stdout
|
||||
assert "name: POC_ACCEPTANCE_JSON_INPUT_PATH" in result.stdout
|
||||
@ -591,24 +591,24 @@ def test_poc_operator_acceptance_renders_real_fixture_inputs():
|
||||
{
|
||||
"POC_ACCEPTANCE_BOS_BUCKET": "poc-bucket",
|
||||
"POC_ACCEPTANCE_BOS_ENDPOINT": "https://bj.bcebos.com",
|
||||
"POC_ACCEPTANCE_XPLATFORM_SOURCE_PATH": "/workspace/fixtures/xplatform",
|
||||
"POC_ACCEPTANCE_CSV_INPUT_PATH": "/workspace/fixtures/records.csv",
|
||||
"POC_ACCEPTANCE_JSON_INPUT_PATH": "/workspace/fixtures/records.json",
|
||||
"POC_ACCEPTANCE_LEROBOT_SOURCE_PATH": "/workspace/fixtures/lerobot",
|
||||
"POC_ACCEPTANCE_ROSBAG_SOURCE_PATH": "/workspace/fixtures/rosbag2",
|
||||
"POC_ACCEPTANCE_MODEL_JSON_PATH": "/workspace/fixtures/model.json",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/fixtures/shell_acceptance.py",
|
||||
"POC_ACCEPTANCE_XPLATFORM_SOURCE_PATH": "/workspace/datasets/fixtures/xplatform",
|
||||
"POC_ACCEPTANCE_CSV_INPUT_PATH": "/workspace/datasets/fixtures/records.csv",
|
||||
"POC_ACCEPTANCE_JSON_INPUT_PATH": "/workspace/datasets/fixtures/records.json",
|
||||
"POC_ACCEPTANCE_LEROBOT_SOURCE_PATH": "/workspace/datasets/fixtures/lerobot",
|
||||
"POC_ACCEPTANCE_ROSBAG_SOURCE_PATH": "/workspace/datasets/fixtures/rosbag2",
|
||||
"POC_ACCEPTANCE_MODEL_JSON_PATH": "/workspace/datasets/fixtures/model.json",
|
||||
"POC_ACCEPTANCE_SHELL_COMMAND": "python3 /workspace/datasets/fixtures/shell_acceptance.py",
|
||||
}
|
||||
)
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
assert 'value: "/workspace/fixtures/xplatform"' in result.stdout
|
||||
assert 'value: "/workspace/fixtures/records.csv"' in result.stdout
|
||||
assert 'value: "/workspace/fixtures/records.json"' in result.stdout
|
||||
assert 'value: "/workspace/fixtures/lerobot"' in result.stdout
|
||||
assert 'value: "/workspace/fixtures/rosbag2"' in result.stdout
|
||||
assert 'value: "/workspace/fixtures/model.json"' in result.stdout
|
||||
assert 'value: "python3 /workspace/fixtures/shell_acceptance.py"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/xplatform"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/records.csv"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/records.json"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/lerobot"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/rosbag2"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/model.json"' in result.stdout
|
||||
assert 'value: "python3 /workspace/datasets/fixtures/shell_acceptance.py"' in result.stdout
|
||||
|
||||
|
||||
def test_poc_operator_acceptance_renders_fixture_manifest_path():
|
||||
@ -616,13 +616,13 @@ def test_poc_operator_acceptance_renders_fixture_manifest_path():
|
||||
{
|
||||
"POC_ACCEPTANCE_BOS_BUCKET": "poc-bucket",
|
||||
"POC_ACCEPTANCE_BOS_ENDPOINT": "https://bj.bcebos.com",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/fixtures/poc-acceptance.json",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/datasets/fixtures/poc-acceptance.json",
|
||||
}
|
||||
)
|
||||
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
assert "name: POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH" in result.stdout
|
||||
assert 'value: "/workspace/fixtures/poc-acceptance.json"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/poc-acceptance.json"' in result.stdout
|
||||
|
||||
|
||||
def test_poc_operator_acceptance_imports_failed_job_marker_before_wait_status_exit():
|
||||
@ -678,7 +678,7 @@ def test_poc_operator_acceptance_rejects_missing_fixture_manifest_inside_workspa
|
||||
result, calls_path = run_script_with_complete_dcloud_secret(
|
||||
tmp_path,
|
||||
{
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/fixtures/missing-poc-operator-acceptance.json",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/datasets/fixtures/missing-poc-operator-acceptance.json",
|
||||
},
|
||||
)
|
||||
|
||||
@ -690,7 +690,7 @@ def test_poc_operator_acceptance_rejects_missing_fixture_manifest_inside_workspa
|
||||
assert payload["records"][0]["handler"] == "fixture_readiness"
|
||||
assert_fixture_discovery_summary(payload)
|
||||
calls = calls_path.read_text(encoding="utf-8").splitlines()
|
||||
assert '-n droboticflow exec droboticflow-api-test -- sh -c test -f "$1" && test -r "$1" && test -s "$1" -- /workspace/fixtures/missing-poc-operator-acceptance.json' in calls
|
||||
assert '-n droboticflow exec droboticflow-api-test -- sh -c test -f "$1" && test -r "$1" && test -s "$1" -- /workspace/datasets/fixtures/missing-poc-operator-acceptance.json' in calls
|
||||
assert_fixture_discovery_was_called(calls_path)
|
||||
|
||||
|
||||
@ -699,7 +699,7 @@ def test_poc_operator_acceptance_rejects_missing_default_fixture_manifest_before
|
||||
|
||||
assert result.returncode == 1
|
||||
assert "POC acceptance fixture manifest is not a readable non-empty file inside the POC workspace mount" in result.stderr
|
||||
assert "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stderr
|
||||
assert "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json" in result.stderr
|
||||
assert "DROBOTICFLOW_POC_OPERATOR_ACCEPTANCE=" in result.stdout
|
||||
payload = preflight_payload(result)
|
||||
assert payload["preflightFailure"] is True
|
||||
@ -719,7 +719,7 @@ def test_poc_operator_acceptance_skips_fixture_preflight_when_manifest_is_config
|
||||
tmp_path,
|
||||
{
|
||||
"POC_OPERATOR_ACCEPTANCE_DRY_RUN": "true",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/fixtures/poc-operator-acceptance.json",
|
||||
"POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH": "/workspace/datasets/fixtures/poc-operator-acceptance.json",
|
||||
},
|
||||
)
|
||||
|
||||
@ -727,7 +727,7 @@ def test_poc_operator_acceptance_skips_fixture_preflight_when_manifest_is_config
|
||||
assert "fixture-readiness" not in result.stdout
|
||||
assert not calls_path.exists()
|
||||
assert "name: POC_ACCEPTANCE_FIXTURE_MANIFEST_PATH" in result.stdout
|
||||
assert 'value: "/workspace/fixtures/poc-operator-acceptance.json"' in result.stdout
|
||||
assert 'value: "/workspace/datasets/fixtures/poc-operator-acceptance.json"' in result.stdout
|
||||
|
||||
|
||||
def test_poc_operator_acceptance_job_script_compiles():
|
||||
|
||||
@ -104,7 +104,7 @@ else:
|
||||
assert result.returncode == 0, result.stderr + result.stdout
|
||||
assert "created workflow batches" in result.stdout
|
||||
payload = json.loads(captured.read_text(encoding="utf-8"))
|
||||
assert payload["fixtureManifestPath"] == "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
assert payload["fixtureManifestPath"] == "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
assert payload["includeDcloud"] is False
|
||||
assert payload["includeShellCommand"] is True
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ def test_preflight_result_generates_default_run_id_on_current_python(tmp_path):
|
||||
"status": "failed",
|
||||
"required": True,
|
||||
"message": "fixture-manifest is missing",
|
||||
"evidence": {"path": "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"},
|
||||
"evidence": {"path": "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"},
|
||||
}
|
||||
],
|
||||
}
|
||||
@ -129,13 +129,13 @@ def test_strict_acceptance_stops_when_readiness_is_blocked(tmp_path):
|
||||
"\"message\":\"OPERATOR_RUNNER_IMAGE is not configured\",\"evidence\":{}},"
|
||||
"{\"name\":\"fixture-manifest\",\"status\":\"passed\",\"required\":true,"
|
||||
"\"message\":\"fixture-manifest and real fixture paths are ready\","
|
||||
"\"evidence\":{\"path\":\"/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json\","
|
||||
"\"fixtures\":{\"xplatform\":\"/workspace/fixtures/poc-operator-acceptance/xplatform\","
|
||||
"\"csv\":\"/workspace/fixtures/poc-operator-acceptance/csv/records.csv\","
|
||||
"\"json\":\"/workspace/fixtures/poc-operator-acceptance/json/records.json\","
|
||||
"\"lerobot\":\"/workspace/fixtures/poc-operator-acceptance/lerobot\","
|
||||
"\"rosbag\":\"/workspace/fixtures/poc-operator-acceptance/rosbag\","
|
||||
"\"model\":\"/workspace/fixtures/poc-operator-acceptance/model/quality-gate.json\"},"
|
||||
"\"evidence\":{\"path\":\"/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json\","
|
||||
"\"fixtures\":{\"xplatform\":\"/workspace/datasets/fixtures/poc-operator-acceptance/xplatform\","
|
||||
"\"csv\":\"/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv\","
|
||||
"\"json\":\"/workspace/datasets/fixtures/poc-operator-acceptance/json/records.json\","
|
||||
"\"lerobot\":\"/workspace/datasets/fixtures/poc-operator-acceptance/lerobot\","
|
||||
"\"rosbag\":\"/workspace/datasets/fixtures/poc-operator-acceptance/rosbag\","
|
||||
"\"model\":\"/workspace/datasets/fixtures/poc-operator-acceptance/model/quality-gate.json\"},"
|
||||
"\"shellCommandConfigured\":true}}]}'\n"
|
||||
"exit 1\n"
|
||||
),
|
||||
@ -162,10 +162,10 @@ def test_strict_acceptance_stops_when_readiness_is_blocked(tmp_path):
|
||||
assert payload["generatedFixtureCount"] == 0
|
||||
assert payload["allFixturesReal"] is True
|
||||
assert payload["fixtureSources"]["allowGeneratedFixtures"] is False
|
||||
assert payload["fixtureSources"]["fixtureManifestPath"] == "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
assert payload["fixtureSources"]["fixtureManifestPath"] == "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json"
|
||||
assert sorted(payload["fixtureSources"]["items"]) == ["csv", "json", "lerobot", "model", "rosbag", "xplatform"]
|
||||
assert payload["fixtureSources"]["items"]["csv"] == {
|
||||
"path": "/workspace/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"path": "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv",
|
||||
"generated": False,
|
||||
}
|
||||
assert not (tmp_path / "operator-called").exists()
|
||||
|
||||
@ -56,10 +56,10 @@ const fullPayload = {
|
||||
allFixturesReal: true,
|
||||
fixtureSources: {
|
||||
allowGeneratedFixtures: false,
|
||||
fixtureManifestPath: "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json",
|
||||
fixtureManifestPath: "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json",
|
||||
items: {
|
||||
xplatform: { path: "/workspace/fixtures/poc-operator-acceptance/xplatform", generated: false },
|
||||
csv: { path: "/workspace/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
xplatform: { path: "/workspace/datasets/fixtures/poc-operator-acceptance/xplatform", generated: false },
|
||||
csv: { path: "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
},
|
||||
},
|
||||
importSource: {
|
||||
@ -242,10 +242,10 @@ test("marks dependency-isolation acceptance as limited evidence", () => {
|
||||
externalVerificationMissing: [],
|
||||
fixtureSources: {
|
||||
allowGeneratedFixtures: false,
|
||||
fixtureManifestPath: "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json",
|
||||
fixtureManifestPath: "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json",
|
||||
items: {
|
||||
csv: { path: "/workspace/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
json: { path: "/workspace/fixtures/poc-operator-acceptance/json/records.json", generated: false },
|
||||
csv: { path: "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
json: { path: "/workspace/datasets/fixtures/poc-operator-acceptance/json/records.json", generated: false },
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -257,7 +257,7 @@ test("marks dependency-isolation acceptance as limited evidence", () => {
|
||||
assert.equal(summary.tone, "warning");
|
||||
assert.equal(summary.acceptanceScope, "dependency-isolation");
|
||||
assert.deepEqual(summary.missingCoverage, ["dcloud_data_generation", "dcloud_embodied_annotation"]);
|
||||
assert.equal(summary.fixtureManifestPath, "/workspace/fixtures/poc-operator-acceptance/poc-operator-acceptance.json");
|
||||
assert.equal(summary.fixtureManifestPath, "/workspace/datasets/fixtures/poc-operator-acceptance/poc-operator-acceptance.json");
|
||||
assert.equal(summary.generatedFixtureCount, 0);
|
||||
assert.equal(summary.externalVerificationPassedCount, 2);
|
||||
assert.equal(summary.externalVerificationRequiredCount, 2);
|
||||
@ -267,8 +267,8 @@ test("marks dependency-isolation acceptance as limited evidence", () => {
|
||||
assert.equal(summary.realFixtureCount, 2);
|
||||
assert.equal(summary.allFixturesReal, true);
|
||||
assert.deepEqual(summary.fixtureSources, [
|
||||
{ name: "csv", path: "/workspace/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
{ name: "json", path: "/workspace/fixtures/poc-operator-acceptance/json/records.json", generated: false },
|
||||
{ name: "csv", path: "/workspace/datasets/fixtures/poc-operator-acceptance/csv/records.csv", generated: false },
|
||||
{ name: "json", path: "/workspace/datasets/fixtures/poc-operator-acceptance/json/records.json", generated: false },
|
||||
]);
|
||||
assert.equal(pocAcceptanceKindLabel(artifact), "POC CHECK");
|
||||
assert.equal(pocAcceptanceSecondaryLabel(artifact), "dependency-isolation / 26/28 operators");
|
||||
@ -283,8 +283,8 @@ test("downgrades generated fixture diagnostics so they cannot look like final ac
|
||||
fixtureSources: {
|
||||
allowGeneratedFixtures: true,
|
||||
items: {
|
||||
xplatform: { path: "/workspace/acceptance/generated/xplatform", generated: true },
|
||||
csv: { path: "/workspace/acceptance/generated/records.csv", generated: false },
|
||||
xplatform: { path: "/workspace/system/acceptance/general/generated/xplatform", generated: true },
|
||||
csv: { path: "/workspace/system/acceptance/general/generated/records.csv", generated: false },
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user