Move parent devfiles in specific directories (#6818)

redhat-developer · May 16, 2023 · 67709ff · 67709ff
1 parent a6da3e0
commit 67709ff
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/pkg/libdevfile/testdata/child-devfile-commands-only.yaml b/pkg/libdevfile/testdata/child-devfile-commands-only.yaml
@@ -2,7 +2,7 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: parent/parent-devfile-components-only.yaml
+  uri: parent/components-only/parent-devfile-components-only.yaml
 commands:
 - exec:
     commandLine: GOCACHE=${PROJECT_SOURCE}/.cache go build main.go

diff --git a/pkg/libdevfile/testdata/child-devfile-complete.yaml b/pkg/libdevfile/testdata/child-devfile-complete.yaml
@@ -31,4 +31,4 @@ metadata:
   name: my-go-app
 schemaVersion: 2.1.0
 parent:
-  uri: parent/parent-devfile-empty.yaml
+  uri: parent/empty/parent-devfile-empty.yaml
diff --git a/pkg/libdevfile/testdata/child-devfile-components-only.yaml b/pkg/libdevfile/testdata/child-devfile-components-only.yaml
@@ -2,7 +2,7 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: "parent/parent-devfile-commands-only.yaml"
+  uri: "parent/commands-only/parent-devfile-commands-only.yaml"
 components:
 - container:
     endpoints:

diff --git a/pkg/libdevfile/testdata/child-devfile.yaml b/pkg/libdevfile/testdata/child-devfile.yaml
@@ -2,4 +2,4 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: "parent/parent-devfile.yaml"
+  uri: "parent/complete/parent-devfile.yaml"
diff --git a/.../parent/parent-devfile-commands-only.yaml → ...ds-only/parent-devfile-commands-only.yaml b/.../parent/parent-devfile-commands-only.yaml → ...ds-only/parent-devfile-commands-only.yaml
diff --git a/...vfile/testdata/parent/parent-devfile.yaml → ...tdata/parent/complete/parent-devfile.yaml b/...vfile/testdata/parent/parent-devfile.yaml → ...tdata/parent/complete/parent-devfile.yaml
diff --git a/...arent/parent-devfile-components-only.yaml → ...-only/parent-devfile-components-only.yaml b/...arent/parent-devfile-components-only.yaml → ...-only/parent-devfile-components-only.yaml
diff --git a/...testdata/parent/parent-devfile-empty.yaml → ...ta/parent/empty/parent-devfile-empty.yaml b/...testdata/parent/parent-devfile-empty.yaml → ...ta/parent/empty/parent-devfile-empty.yaml
diff --git a/pkg/libdevfile/uris_test.go b/pkg/libdevfile/uris_test.go
@@ -294,7 +294,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile.yaml",
+				"parent/complete/parent-devfile.yaml",
 			},
 			wantErr: false,
 		},
@@ -311,7 +311,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile-commands-only.yaml",
+				"parent/commands-only/parent-devfile-commands-only.yaml",
 			},
 			wantErr: false,
 		},
@@ -328,7 +328,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile-components-only.yaml",
+				"parent/components-only/parent-devfile-components-only.yaml",
 			},
 			wantErr: false,
 		},