Skip to content

Commit 2cb41b6

Browse files
thepetkthepetk
authored
Bump up devfile library on dependent registry test modules (#396)
* Bump up devfile library for odo3 tests Signed-off-by: thepetk <thepetk@gmail.com> * Bump up devfile library to validate_devfile_schemas test Signed-off-by: thepetk <thepetk@gmail.com> * Remove temp fix for 2.2.1 and 2.2.2 Signed-off-by: thepetk <thepetk@gmail.com> --------- Signed-off-by: thepetk <thepetk@gmail.com>
1 parent beecb12 commit 2cb41b6

File tree

5 files changed

+18
-28
lines changed

5 files changed

+18
-28
lines changed

‎tests/odov3/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/devfile/registry/tests/odov3
33
go 1.19
44

55
require (
6-
github.com/devfile/api/v2 v2.2.1
7-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4
6+
github.com/devfile/api/v2 v2.2.2
7+
github.com/devfile/library/v2 v2.2.2
88
github.com/onsi/ginkgo/v2 v2.13.0
99
github.com/onsi/gomega v1.29.0
1010
)
@@ -23,7 +23,7 @@ require (
2323
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 // indirect
26-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746 // indirect
26+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce // indirect
2727
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
2828
github.com/distribution/reference v0.5.0 // indirect
2929
github.com/docker/cli v25.0.1+incompatible // indirect

‎tests/odov3/go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,14 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
9292
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9393
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
9494
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
95-
github.com/devfile/api/v2 v2.2.1 h1:VSX297YqY4C4j4uhn7M0RdZeBaeWqyVi4NnagzEmxu0=
96-
github.com/devfile/api/v2 v2.2.1/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
97-
github.com/devfile/library/v2 v2.2.2-0.20240311165050-d3c277078874 h1:5qYE7lZCkd6N8ipKOfDSD/+fk7uygQYiRWdhRdtxlQo=
98-
github.com/devfile/library/v2 v2.2.2-0.20240311165050-d3c277078874/go.mod h1:BOLGb4k2RcuJEs7UK5bmvBnDLVkGxsKO2s1rceYmfEo=
99-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4 h1:9eIiFsDMQ8aLPbrqXSBkfe3Cd2CeZbbGiJXo6SilEo0=
100-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4/go.mod h1:BOLGb4k2RcuJEs7UK5bmvBnDLVkGxsKO2s1rceYmfEo=
95+
github.com/devfile/api/v2 v2.2.2 h1:DXRCPWFlZhTIE38Of2jzTRjQHadfbxBC8GS+m+EjoCU=
96+
github.com/devfile/api/v2 v2.2.2/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
97+
github.com/devfile/library/v2 v2.2.2 h1:iLtFQ16aYMcB+vUx7NKtKPiTEursxwueu6/qOailubA=
98+
github.com/devfile/library/v2 v2.2.2/go.mod h1:LHgAu9VApI++hE+cr6CWrkj1OlzHOJeKbraqC5PxSec=
10199
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 h1:t09mGdy31tC2YBp6kVD7x8m0jq1CyBUSYMUvrF0iaWw=
102100
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4/go.mod h1:3Ngbmm12LW03tAEHpDNymM7zryd5H1Xo3ZAGlBpecf8=
103-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746 h1:VQLQguSjxcU1xtUjbqmEW6R9Ehgjk1PzG56vHnzXyEw=
104-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
101+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce h1:IgUCI7eCq6m0JzRx3+FZuIeJy5e+rUSQYMr3NBzrqyg=
102+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
105103
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
106104
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI=
107105
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=

‎tests/odov3/odo_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ var _ = Describe("test starter projects from devfile stacks", func() {
153153
for _, stack := range stacks {
154154
stack := stack
155155

156-
// TEMP: ignore testing schema versions 2.2.2 & 2.2.1 due to odo incompatibility
157-
// related issue: https://github.com/devfile/api/issues/1494
158-
if stack.schemaVersion == "2.2.1" || stack.schemaVersion == "2.2.2" {
159-
continue
160-
}
161-
162156
if len(stack.starterProjects) == 0 {
163157
It(fmt.Sprintf("stack: %s version: %s no_starter", stack.name, stack.version), func() {
164158
// No starter projects defined in Devfile => let's start a Dev Session with --no-commands

‎tests/validate_devfile_schemas/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/devfile/registry/tests/validate_devfiles
33
go 1.19
44

55
require (
6-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4
6+
github.com/devfile/library/v2 v2.2.2
77
github.com/onsi/ginkgo/v2 v2.13.0
88
github.com/onsi/gomega v1.29.0
99
)
@@ -21,9 +21,9 @@ require (
2121
github.com/containerd/log v0.1.0 // indirect
2222
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
2323
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
24-
github.com/devfile/api/v2 v2.2.1 // indirect
24+
github.com/devfile/api/v2 v2.2.2 // indirect
2525
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 // indirect
26-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746 // indirect
26+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce // indirect
2727
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
2828
github.com/distribution/reference v0.5.0 // indirect
2929
github.com/docker/cli v25.0.1+incompatible // indirect

‎tests/validate_devfile_schemas/go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,14 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
9797
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9898
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
9999
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
100-
github.com/devfile/api/v2 v2.2.1 h1:VSX297YqY4C4j4uhn7M0RdZeBaeWqyVi4NnagzEmxu0=
101-
github.com/devfile/api/v2 v2.2.1/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
102-
github.com/devfile/library/v2 v2.2.2-0.20240311165050-d3c277078874 h1:5qYE7lZCkd6N8ipKOfDSD/+fk7uygQYiRWdhRdtxlQo=
103-
github.com/devfile/library/v2 v2.2.2-0.20240311165050-d3c277078874/go.mod h1:BOLGb4k2RcuJEs7UK5bmvBnDLVkGxsKO2s1rceYmfEo=
104-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4 h1:9eIiFsDMQ8aLPbrqXSBkfe3Cd2CeZbbGiJXo6SilEo0=
105-
github.com/devfile/library/v2 v2.2.2-0.20240315205431-44ca18d63cf4/go.mod h1:BOLGb4k2RcuJEs7UK5bmvBnDLVkGxsKO2s1rceYmfEo=
100+
github.com/devfile/api/v2 v2.2.2 h1:DXRCPWFlZhTIE38Of2jzTRjQHadfbxBC8GS+m+EjoCU=
101+
github.com/devfile/api/v2 v2.2.2/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
102+
github.com/devfile/library/v2 v2.2.2 h1:iLtFQ16aYMcB+vUx7NKtKPiTEursxwueu6/qOailubA=
103+
github.com/devfile/library/v2 v2.2.2/go.mod h1:LHgAu9VApI++hE+cr6CWrkj1OlzHOJeKbraqC5PxSec=
106104
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 h1:t09mGdy31tC2YBp6kVD7x8m0jq1CyBUSYMUvrF0iaWw=
107105
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4/go.mod h1:3Ngbmm12LW03tAEHpDNymM7zryd5H1Xo3ZAGlBpecf8=
108-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746 h1:VQLQguSjxcU1xtUjbqmEW6R9Ehgjk1PzG56vHnzXyEw=
109-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
106+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce h1:IgUCI7eCq6m0JzRx3+FZuIeJy5e+rUSQYMr3NBzrqyg=
107+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
110108
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
111109
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI=
112110
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=

0 commit comments

Comments
 (0)