Skip to content

ROSAENG-62156 fix: add openshift version and channel group support for CAPA e2e #82728

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

Merged
openshift-merge-bot merged 1 commit into from
Aug 3, 2026
+17 −1
Merged

ROSAENG-62156 fix: add openshift version and channel group support for CAPA e2e #82728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main_capa-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ tests:
steps:
cluster_profile: openshift-org-aws
env:
CHANNEL_GROUP: stable
OPENSHIFT_VERSION: "4.22"
REGION: us-east-1
TEST_SUITE: --tag smoke
workflow: rosa-e2e-capa
Expand Down
10 changes: 9 additions & 1 deletion ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,15 @@ export DEPLOYMENT_MODE
# Generate a unique 4-char prefix per run to avoid IAM role name collisions
NAME_PREFIX="ci$(head -c 2 /dev/urandom | od -An -tx1 | tr -d ' ')"

EXTRA_VARS=("-e" "name_prefix=${NAME_PREFIX}")
if [[ -n "${OPENSHIFT_VERSION}" ]]; then
EXTRA_VARS+=("-e" "openshift_version=${OPENSHIFT_VERSION}")
fi
if [[ -n "${CHANNEL_GROUP}" ]]; then
EXTRA_VARS+=("-e" "channel_group=${CHANNEL_GROUP}")
fi

echo "Running rosa-hcp-e2e tests (name_prefix=${NAME_PREFIX})..."
"${PYTHON}" run-test-suite.py ${TEST_SUITE} --ai-agent -e name_prefix="${NAME_PREFIX}" 2>&1 | tee "${ARTIFACT_DIR}/rosa-hcp-e2e-test.log"
"${PYTHON}" run-test-suite.py ${TEST_SUITE} --ai-agent "${EXTRA_VARS[@]}" 2>&1 | tee "${ARTIFACT_DIR}/rosa-hcp-e2e-test.log"

echo "Tests complete. Results at ${ARTIFACT_DIR}/rosa-hcp-e2e-test.log"
6 changes: 6 additions & 0 deletions ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ ref:
- name: TEST_SUITE
default: "--list"
documentation: Test suite argument passed to run-test-suite.py (e.g. 10-install-capi-standalone, --tag standalone, --all).
- name: OPENSHIFT_VERSION
default: ""
documentation: OpenShift version to provision (e.g. 4.22). If empty, uses the default from the test repo.
- name: CHANNEL_GROUP
default: ""
documentation: OCM version channel group (stable, nightly, candidate). If empty, uses the default from the test repo.
documentation: |-
Clones the stolostron/rosa-hcp-e2e-test repository and runs the
ROSA HCP e2e test suite against the management cluster with
Expand Down