OCM-23830 Migrate cs-rosa-hcp-backup-cp-upgrade-integration-main OCM FVT job to Prow periodic. - #78767
Conversation
|
@tinaafitz, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
WalkthroughA new CI-operator configuration file is added for an OpenShift Rosa E2E test job. The file specifies base images, build environment, OCP 4.22 releases, resource constraints, and a periodic test job that executes OCM FVT integration tests with Jira reporting. ChangesRosa E2E OCM FVT Integration Test Configuration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml`:
- Around line 237-239: The umask is set after mktemp, so the temp file created
by podman_env_file="$(mktemp ...)" isn't protected by the intended umask; move
the umask 077 line to before the mktemp invocation so umask takes effect for the
newly created file (i.e., set umask 077, then create podman_env_file with
mktemp, then install the trap to remove it). Ensure you still keep the trap('rm
-f "${podman_env_file}"' EXIT) and no other behavior changes.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 7ec0eed1-0b05-4e49-9f9f-b62f69079088
⛔ Files ignored due to path filters (1)
ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-periodics.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (1)
ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml
8c41919 to
f952194
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-rosa-hcp-integration.yaml`:
- Around line 29-38: The JOB_LINK construction is done inside a sanitized shell
started with "env -i bash --norc --noprofile << 'EOF' > /tmp/podman.env", which
clears PULL_NUMBER, JOB_NAME and BUILD_ID; update the invocation so those Prow
environment variables are preserved (either remove "env -i" or explicitly export
PULL_NUMBER, JOB_NAME and BUILD_ID into the subshell before constructing
JOB_LINK) so the conditional that appends pr-logs or logs uses the real values;
ensure the symbols JOB_LINK, PULL_NUMBER, JOB_NAME and BUILD_ID in the here-doc
reflect the preserved variables.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 9d48b4fd-7d50-4914-b82c-ae1968339b9d
📒 Files selected for processing (1)
ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-rosa-hcp-integration.yaml
| env -i bash --norc --noprofile << 'EOF' > /tmp/podman.env | ||
| export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred | ||
| export AWS_SHARED_VPC_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials | ||
| export ENABLE_JIRA_REPORTING=true | ||
| JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/" | ||
| if [ -n "${PULL_NUMBER:-}" ]; then | ||
| JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}" | ||
| else | ||
| JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}" | ||
| fi |
There was a problem hiding this comment.
Preserve Prow vars when generating JOB_LINK.
env -i drops PULL_NUMBER, JOB_NAME, and BUILD_ID, so the constructed link can become incomplete/incorrect. Pass required vars explicitly (or remove env -i) before building JOB_LINK.
Suggested fix
- env -i bash --norc --noprofile << 'EOF' > /tmp/podman.env
+ env -i \
+ PULL_NUMBER="${PULL_NUMBER:-}" \
+ JOB_NAME="${JOB_NAME:-}" \
+ BUILD_ID="${BUILD_ID:-}" \
+ bash --norc --noprofile << 'EOF' > /tmp/podman.env📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| env -i bash --norc --noprofile << 'EOF' > /tmp/podman.env | |
| export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred | |
| export AWS_SHARED_VPC_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials | |
| export ENABLE_JIRA_REPORTING=true | |
| JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/" | |
| if [ -n "${PULL_NUMBER:-}" ]; then | |
| JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}" | |
| else | |
| JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}" | |
| fi | |
| env -i \ | |
| PULL_NUMBER="${PULL_NUMBER:-}" \ | |
| JOB_NAME="${JOB_NAME:-}" \ | |
| BUILD_ID="${BUILD_ID:-}" \ | |
| bash --norc --noprofile << 'EOF' > /tmp/podman.env | |
| export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred | |
| export AWS_SHARED_VPC_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials | |
| export ENABLE_JIRA_REPORTING=true | |
| JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/" | |
| if [ -n "${PULL_NUMBER:-}" ]; then | |
| JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}" | |
| else | |
| JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}" | |
| fi |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-rosa-hcp-integration.yaml`
around lines 29 - 38, The JOB_LINK construction is done inside a sanitized shell
started with "env -i bash --norc --noprofile << 'EOF' > /tmp/podman.env", which
clears PULL_NUMBER, JOB_NAME and BUILD_ID; update the invocation so those Prow
environment variables are preserved (either remove "env -i" or explicitly export
PULL_NUMBER, JOB_NAME and BUILD_ID into the subshell before constructing
JOB_LINK) so the conditional that appends pr-logs or logs uses the real values;
ensure the symbols JOB_LINK, PULL_NUMBER, JOB_NAME and BUILD_ID in the here-doc
reflect the preserved variables.
|
/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
@dustman9000: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
f952194 to
7225ff9
Compare
|
/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
@tinaafitz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
7225ff9 to
373859b
Compare
|
pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
373859b to
7312c52
Compare
|
pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
@dustman9000: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
46e666d to
8746092
Compare
|
/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
@tinaafitz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
33cd0cd to
94979f2
Compare
|
pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
/retest |
94979f2 to
6842cd9
Compare
…a-hcp-integration variant
6842cd9 to
bb77d36
Compare
|
/retest-required |
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main |
|
@tinaafitz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/lgtm |
|
@dustman9000: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dustman9000, tinaafitz The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@tinaafitz: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
…a-hcp-integration variant (openshift#78767)
Summary
cs-rosa-hcp-backup-cp-upgrade-integration-mainOCM FVT jobDetails
0 8 * * *(08:00 UTC daily)cms-gating-testocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-maindue to 61-character ci-operator limit. Theocmtest --jobargument uses the full name
cs-rosa-hcp-backup-cp-upgrade-integration-main.This PR adds a new Prow periodic job configuration for the OpenShift Rosa E2E test suite, migrating the
cs-rosa-hcp-backup-cp-upgrade-integration-mainjob from Tekton/Konflux to Prow.Configuration Details:
HCP-Backup-Restore-Autoscalingand no flake retriesTechnical Note:
The Prow test name is shortened to
ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main(using "bkp" instead of "backup") to comply with ci-operator's 61-character naming limit, while the full job namecs-rosa-hcp-backup-cp-upgrade-integration-mainis preserved in the ocmtest command parameter.Infrastructure Impact:
This change affects CI testing for the Rosa E2E suite, enabling automated validation of OpenShift Service on AWS backup and restore functionality during control plane upgrades as part of the regular test pipeline.