Skip to content

🌱 E2E Cleanup #2704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dtfranz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

🌱 E2E Cleanup #2704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe8844
E2E Cleanup
dtfranz May 14, 2026
f324628
Fix ambiguous step definitions
dtfranz May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ cover.out
/install.sh
/install-experimental.sh

# upgrade-e2e artifacts
/experimental-install.sh
/operator-controller-standard.yaml
/standard-install.sh

# vendored files
vendor/

Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,11 @@ e2e: E2E_TIMEOUT ?= 20m
e2e: GODOG_ARGS ?=
e2e: #EXHELP Run the e2e tests.
ifeq ($(strip $(GODOG_ARGS)),)
trap 'exit 130' INT; \
set +e; \
go test -count=1 -v ./test/e2e/features_test.go -timeout=${E2E_TIMEOUT} -args --godog.tags="~@Serial" --godog.concurrency=100; \
go test -count=1 -v ./test/e2e/features_test.go -timeout $(E2E_TIMEOUT) -args --godog.tags="~@Serial" --godog.concurrency=100; \
parallelExit=$$?; \
go test -count=1 -v ./test/e2e/features_test.go -timeout=${E2E_TIMEOUT} -args --godog.tags="@Serial" --godog.concurrency=1; \
go test -count=1 -v ./test/e2e/features_test.go -timeout $(E2E_TIMEOUT) -args --godog.tags="@Serial" --godog.concurrency=1; \
serialExit=$$?; \
if [[ $$parallelExit -ne 0 ]] || [[ $$serialExit -ne 0 ]]; then \
echo "e2e tests failed: parallel=$$parallelExit serial=$$serialExit"; \
Expand Down
12 changes: 7 additions & 5 deletions test/e2e/features/proxy.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ Feature: HTTPS proxy support for outbound catalog requests

Background:
Given OLM is available
And ClusterCatalog "test" serves bundles
And a catalog "test" with packages:
| package | version | channel | replaces | contents |
| test | 1.2.0 | beta | | CRD, Deployment, ConfigMap |
And ServiceAccount "olm-sa" with needed permissions is available in test namespace

@HTTPProxy
Expand All @@ -26,10 +28,10 @@ Feature: HTTPS proxy support for outbound catalog requests
source:
sourceType: Catalog
catalog:
packageName: test
packageName: ${PACKAGE:test}
selector:
matchLabels:
"olm.operatorframework.io/metadata.name": test-catalog
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
"""
Then ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
"""
Expand Down Expand Up @@ -57,9 +59,9 @@ Feature: HTTPS proxy support for outbound catalog requests
source:
sourceType: Catalog
catalog:
packageName: test
packageName: ${PACKAGE:test}
selector:
matchLabels:
"olm.operatorframework.io/metadata.name": test-catalog
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
"""
Then the recording proxy received a CONNECT request for the catalogd service
10 changes: 5 additions & 5 deletions test/e2e/features/update.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Feature: Update ClusterExtension
"""
And ClusterExtension is rolled out
And ClusterExtension is available
When ClusterExtension is updated to version "1.0.1"
When ClusterExtension version is updated to "1.0.1"
Then ClusterExtension is rolled out
And ClusterExtension is available
And bundle "${PACKAGE:test}.1.0.1" is installed in version "1.0.1"
Expand Down Expand Up @@ -219,7 +219,7 @@ Feature: Update ClusterExtension
And ClusterExtension is rolled out
And ClusterExtension is available
And bundle "${PACKAGE:test}.1.0.0" is installed in version "1.0.0"
When ClusterExtension is updated to version "1.0.4"
When ClusterExtension version is updated to "1.0.4"
Then ClusterExtension is rolled out
And ClusterExtension is available
And bundle "${PACKAGE:test}.1.0.4" is installed in version "1.0.4"
Expand Down Expand Up @@ -247,7 +247,7 @@ Feature: Update ClusterExtension
"""
And ClusterExtension is rolled out
And ClusterExtension is available
When ClusterExtension is updated to version "1.0.1"
When ClusterExtension version is updated to "1.0.1"
Then ClusterExtension is rolled out
And ClusterExtension is available
And bundle "${PACKAGE:test}.1.0.1" is installed in version "1.0.1"
Expand Down Expand Up @@ -300,7 +300,7 @@ Feature: Update ClusterExtension
"""
And ClusterExtension is rolled out
And ClusterExtension is available
When ClusterExtension is updated to version "1.2.0"
When ClusterExtension version is updated to "1.2.0"
Then bundle "${PACKAGE:test}.1.2.0" is installed in version "1.2.0"
And ClusterExtension is rolled out
And ClusterExtension is available
Expand Down Expand Up @@ -334,7 +334,7 @@ Feature: Update ClusterExtension
"""
And ClusterExtension is rolled out
And ClusterExtension is available
When ClusterExtension is updated to version "1.0.2"
When ClusterExtension version is updated to "1.0.2"
Then ClusterExtension reports "${NAME}-1, ${NAME}-2" as active revisions
And ClusterObjectSet "${NAME}-2" reports Progressing as True with Reason RollingOut
And ClusterObjectSet "${NAME}-2" reports Available as False with Reason ProbeFailure
1 change: 1 addition & 0 deletions test/e2e/features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var opts = godog.Options{
Output: colors.Colored(os.Stdout),
Concurrency: 1,
NoColors: true,
Strict: true,
Comment thread
dtfranz marked this conversation as resolved.
}

func init() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/steps/steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func RegisterSteps(sc *godog.ScenarioContext) {
sc.Step(`^(?i)bundle "([^"]+)" is installed in version "([^"]+)"$`, BundleInstalled)

sc.Step(`^(?i)ClusterExtension is applied(?:\s+.*)?$`, ResourceIsApplied)
sc.Step(`^(?i)ClusterExtension is updated to version "([^"]+)"$`, ClusterExtensionVersionUpdate)
sc.Step(`^(?i)ClusterExtension version is updated to "([^"]+)"$`, ClusterExtensionVersionUpdate)
sc.Step(`^(?i)ClusterExtension is updated(?:\s+.*)?$`, ResourceIsApplied)
sc.Step(`^(?i)ClusterObjectSet "([^"]+)" lifecycle is set to "([^"]+)"$`, ClusterObjectSetLifecycleUpdate)
sc.Step(`^(?i)ClusterExtension is available$`, ClusterExtensionIsAvailable)
Expand Down
2 changes: 1 addition & 1 deletion test/upgrade-e2e/features/operator-upgrade.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ Feature: Operator upgrade verification

Scenario: ClusterExtension remains functional after OLM upgrade
Given ClusterExtension is reconciled
When ClusterExtension is updated to version "1.0.1"
When ClusterExtension version is updated to "1.0.1"
Then ClusterExtension is available
And bundle "${PACKAGE:test}.1.0.1" is installed in version "1.0.1"
1 change: 1 addition & 0 deletions test/upgrade-e2e/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var opts = godog.Options{
Output: colors.Colored(os.Stdout),
Concurrency: 1,
NoColors: true,
Strict: true,
}

func init() {
Expand Down