Skip to content

Commit

Permalink
Merge pull request #1163 from SaschaSchwarze0/sascha-ginkgo-deprecations
Browse files Browse the repository at this point in the history
Remove usage of deprecated Ginkgo capabilities
  • Loading branch information
openshift-merge-robot authored Dec 6, 2022
2 parents 45b6d9f + 966c24e commit d82a3d9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ TEST_NAMESPACE ?= default
TEKTON_VERSION ?= v0.30.0

# E2E test flags
TEST_E2E_FLAGS ?= --fail-fast -p --randomize-all --slow-spec-threshold=5m -timeout=1h -progress -trace -v
TEST_E2E_FLAGS ?= --fail-fast -p --randomize-all -timeout=1h -progress -trace -v

# E2E test service account name to be used for the build runs, can be set to generated to use the generated service account feature
TEST_E2E_SERVICEACCOUNT_NAME ?= pipeline
Expand Down Expand Up @@ -189,7 +189,6 @@ test-unit-ginkgo: ginkgo
--randomize-suites \
--fail-on-pending \
--keep-going \
--slow-spec-threshold=4m \
-compilers=2 \
-race \
-trace \
Expand All @@ -203,7 +202,6 @@ test-integration: install-apis ginkgo
--randomize-all \
--randomize-suites \
--fail-on-pending \
--slow-spec-threshold=4m \
-trace \
test/integration/...

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_one_off_builds_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = Describe("Using One-Off Builds", func() {
)

AfterEach(func() {
if CurrentGinkgoTestDescription().Failed {
if CurrentSpecReport().Failed() {
printTestFailureDebugInfo(testBuild, testBuild.Namespace, testID)

} else if buildRun != nil {
Expand Down

0 comments on commit d82a3d9

Please sign in to comment.