Skip to content
Snippets Groups Projects
Unverified Commit e423451b authored by Julian Tölle's avatar Julian Tölle Committed by GitHub
Browse files

ci(e2e): less ginkgo output (#955)

The `e2e.test` binary has __all__ kubernetes tests, but we only run
those that start with `External.Storage`. This means there is a lot of
"Skipped" output right now, that is useless. By setting
`--silence-skips` these log lines are removed.

Additional ginkgo offers a `--github-output` flag that promises to make
the output nicer for GitHub actions. Not sure what it really does.

These flags are only supported in Ginkgo 2.18+, which is only available
in Kubernetes 1.31+.
parent 3037fee5
No related branches found
No related tags found
No related merge requests found
...@@ -58,6 +58,10 @@ jobs: ...@@ -58,6 +58,10 @@ jobs:
K8S_TEST_VERSION: ${{ matrix.k8s-test }} K8S_TEST_VERSION: ${{ matrix.k8s-test }}
ENV: gha-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.k3s }} ENV: gha-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.k3s }}
# These ginkgo flags were only added in 2.17+2.18, which is available in Kubernetes v1.31+
# Can be simplified once we no longer test <1.31.
GINKGO_EXTRA_ARGS: ${{ (matrix.k3s != 'v1.29' && matrix.k3s != 'v1.30') && '--silence-skips --github-output' || '' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
......
...@@ -4,6 +4,7 @@ K8S_TEST_VERSION ?= v1.32.1 ...@@ -4,6 +4,7 @@ K8S_TEST_VERSION ?= v1.32.1
GINKGO = bin/ginkgo GINKGO = bin/ginkgo
GINKGO_ARGS = -v --flake-attempts=2 GINKGO_ARGS = -v --flake-attempts=2
GINKGO_EXTRA_ARGS ?= ""
E2E = bin/e2e.test E2E = bin/e2e.test
E2E_ARGS = -storage.testdriver=$(CURDIR)/testdriver.yaml E2E_ARGS = -storage.testdriver=$(CURDIR)/testdriver.yaml
...@@ -16,14 +17,14 @@ bin: ...@@ -16,14 +17,14 @@ bin:
kubernetes/test/bin/ginkgo kubernetes/test/bin/ginkgo
parallel: bin parallel: bin
$(GINKGO) $(GINKGO_ARGS) \ $(GINKGO) $(GINKGO_ARGS) $(GINKGO_EXTRA_ARGS) \
-nodes=12 \ -nodes=12 \
-focus='External.Storage' \ -focus='External.Storage' \
-skip='\[Feature:|\[Disruptive\]|\[Serial\]' \ -skip='\[Feature:|\[Disruptive\]|\[Serial\]' \
$(E2E) -- $(E2E_ARGS) $(E2E) -- $(E2E_ARGS)
serial: bin serial: bin
$(GINKGO) $(GINKGO_ARGS) \ $(GINKGO) $(GINKGO_ARGS) $(GINKGO_EXTRA_ARGS) \
-focus='External.Storage.*(\[Feature:|\[Serial\])' \ -focus='External.Storage.*(\[Feature:|\[Serial\])' \
$(E2E) -- $(E2E_ARGS) $(E2E) -- $(E2E_ARGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment