Skip to content

Commit

Permalink
Conformance: Fix warnings
Browse files Browse the repository at this point in the history
- Fix case mismatch in Dockerfile
- Fix ginkgo deprecated flags
- Fix controller runtime SetLogger never called

Signed-off-by: Lennart Jern <[email protected]>
  • Loading branch information
lentzi90 committed Jan 10, 2025
1 parent 8f2cc78 commit 13b43d3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build the manager binary
FROM golang:1.22.0 as builder
FROM golang:1.22.0 AS builder
WORKDIR /workspace

# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data/kubetest/conformance-fast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ ginkgo.focus: \[Conformance\]
ginkgo.skip: .*\[Serial\].*
disable-log-dump: true
ginkgo.show-node-events: true
ginkgo.slowSpecThreshold: 120.0
ginkgo.flakeAttempts: 3
ginkgo.slow-spec-threshold: 120.0
ginkgo.flake-attempts: 3
ginkgo.trace: true
ginkgo.timeout: 3h
ginkgo.v: true
4 changes: 2 additions & 2 deletions test/e2e/data/kubetest/conformance.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ginkgo.focus: \[Conformance\]
disable-log-dump: true
ginkgo.show-node-events: true
ginkgo.slowSpecThreshold: 120.0
ginkgo.flakeAttempts: 3
ginkgo.slow-spec-threshold: 120.0
ginkgo.flake-attempts: 3
ginkgo.trace: true
ginkgo.timeout: 3h
ginkgo.v: true
2 changes: 2 additions & 0 deletions test/e2e/suites/conformance/conformance_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
ctrl "sigs.k8s.io/controller-runtime"

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

func TestConformance(t *testing.T) {
RegisterFailHandler(Fail)
ctrl.SetLogger(GinkgoLogr)
RunSpecs(t, "capo-conformance")
}

Expand Down

0 comments on commit 13b43d3

Please sign in to comment.