Skip to content

Commit 6f66793

Browse files
authored
Merge pull request #2357 from Nordix/lentzi90/conformance-suite-fix
🌱 Conformance: Fix warnings
2 parents 8f2cc78 + d3b6e98 commit 6f66793

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.22.0 as builder
16+
FROM golang:1.22.0 AS builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy

test/e2e/data/kubetest/conformance-fast.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ginkgo.focus: \[Conformance\]
22
ginkgo.skip: .*\[Serial\].*
33
disable-log-dump: true
44
ginkgo.show-node-events: true
5-
ginkgo.slowSpecThreshold: 120.0
6-
ginkgo.flakeAttempts: 3
5+
ginkgo.slow-spec-threshold: 120s
6+
ginkgo.flake-attempts: 3
77
ginkgo.trace: true
88
ginkgo.timeout: 3h
99
ginkgo.v: true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ginkgo.focus: \[Conformance\]
22
disable-log-dump: true
33
ginkgo.show-node-events: true
4-
ginkgo.slowSpecThreshold: 120.0
5-
ginkgo.flakeAttempts: 3
4+
ginkgo.slow-spec-threshold: 120s
5+
ginkgo.flake-attempts: 3
66
ginkgo.trace: true
77
ginkgo.timeout: 3h
88
ginkgo.v: true

test/e2e/suites/conformance/conformance_suite_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
28+
ctrl "sigs.k8s.io/controller-runtime"
2829

2930
"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
3031
)
@@ -38,6 +39,7 @@ func init() {
3839

3940
func TestConformance(t *testing.T) {
4041
RegisterFailHandler(Fail)
42+
ctrl.SetLogger(GinkgoLogr)
4143
RunSpecs(t, "capo-conformance")
4244
}
4345

0 commit comments

Comments
 (0)