Skip to content

[TEST ONLY] Test CNTRLPLANE-3568 AWS additional-tags propagation#80773

Open
mgencur wants to merge 1 commit into
openshift:mainfrom
mgencur:test_CNTRLPLANE-3568_user_define_tags
Open

[TEST ONLY] Test CNTRLPLANE-3568 AWS additional-tags propagation#80773
mgencur wants to merge 1 commit into
openshift:mainfrom
mgencur:test_CNTRLPLANE-3568_user_define_tags

Conversation

@mgencur

@mgencur mgencur commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

This is to run the new test in openshift/hypershift#8712

Summary by CodeRabbit

This PR is a test-only CI update to validate CNTRLPLANE-3568: propagation of user-defined “additional-tags” in AWS for the hypershift operator.

What changed in CI/infrastructure

  • Added/updated a hypershift CI config (ci-operator/config/.../mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml) to define a complete build + test pipeline for OCP 5.0:
    • Builds the hypershift control-plane and e2e test images, and produces a derived CLI image with tooling installed.
    • Targets OCP 5.0 release streams (initial and latest/integration).
    • Adds an optional e2e-v2-aws test step that runs the AWS E2E workflow with the necessary environment overrides for the additional-tags scenario.
  • Narrowed the e2e v2 test selection (ci-operator/step-registry/.../hypershift-e2e-v2-chain.yaml) by changing the Ginkgo label selector from excluding lifecycle tests (!lifecycle) to running only lifecycle tests for hosted-cluster-aws (lifecycle && hosted-cluster-aws).

Overall, the change focuses CI execution on the AWS “user-defined tags” coverage and ensures the relevant lifecycle test subset runs for AWS hosted clusters.

@coderabbitai

coderabbitai Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: ae5131cb-fe6a-4cb9-bd58-bdfc5de74871

📥 Commits

Reviewing files that changed from the base of the PR and between 84ae202 and 4426b0a.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml
  • ci-operator/step-registry/hypershift/e2e-v2/hypershift-e2e-v2-chain.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml

Walkthrough

A new ci-operator YAML configuration file is added for the mgencur/hypershift repository on the CNTRLPLANE-3568_user_define_tags branch. It defines base images, built images (including a hypershift-cli image with jq), OCP 5.0 release streams, resource limits, and an optional AWS E2E test step. The E2E test step filter is updated to run lifecycle tests specific to hosted-cluster-aws.

Changes

CI and E2E Test Configuration

Layer / File(s) Summary
CI operator config: images, releases, resources, and E2E test
ci-operator/config/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml
New file defining base images (OCP CLI 5.0), built images (hypershift-operator, hypershift-e2e, hypershift-cli with jq), OCP 5.0 release streams, CPU/memory resource limits, optional e2e-v2-aws test with TECH_PREVIEW_NO_UPGRADE, and zz_generated_metadata for the CNTRLPLANE-3568 branch.
E2E test step filter update
ci-operator/step-registry/hypershift/e2e-v2/hypershift-e2e-v2-chain.yaml
Ginkgo label filter updated from excluding lifecycle tests to including only lifecycle tests filtered to hosted-cluster-aws, refining which E2E tests execute for this configuration.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

jira/valid-reference

Suggested reviewers

  • sjenning
  • bryan-cox
🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Microshift Test Compatibility ❓ Inconclusive The PR is a CI configuration-only change. Actual test code (Ginkgo definitions) is in hypershift repository PR #8712, not visible in this PR. MicroShift compatibility cannot be verified without exa... Review the actual test code in hypershift PR #8712 to verify Ginkgo tests don't use unavailable APIs and are properly marked if incompatible with MicroShift.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and specifically describes the main change: a test-only PR for testing AWS additional-tags propagation related to CNTRLPLANE-3568, which aligns with the PR objectives and file modifications.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed This PR contains only CI configuration YAML files, not Ginkgo test code. The check for stable test names is not applicable since no test code was added or modified.
Test Structure And Quality ✅ Passed This PR contains only CI/CD configuration files (YAML), not Ginkgo test code. The check for Ginkgo test structure and quality does not apply to this PR since no Go test files are included in the ch...
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR modifies only CI configuration files. The test being added is for HyperShift hosted cluster tag propagation, which requires a multi-node management cluster by architectural necessity. SNO c...
Topology-Aware Scheduling Compatibility ✅ Passed Files modified are CI/CD configuration (ci-operator config and test step registry), not deployment manifests or operator code. No scheduling constraints or topology-dependent configurations present.
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML CI configuration files and helper scripts, not executable code or OTE test binaries. The OTE Binary Stdout Contract check applies to executable code in main/init/suite functio...
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR contains only CI configuration files in the openshift/release repository, not Ginkgo test implementations. The actual test code is in openshift/hypershift#8712. The check for IPv4/disconnec...
No-Weak-Crypto ✅ Passed PR contains only YAML CI/CD configuration files with no weak cryptographic algorithms, custom crypto implementations, or non-constant-time secret comparisons detected.
Container-Privileges ✅ Passed Both modified files are CI/CD configuration files with no privileged container settings (privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation) detected.
No-Sensitive-Data-In-Logs ✅ Passed PR contains no logging or exposure of passwords, tokens, API keys, PII, session IDs, internal hostnames, or customer data. Only test configuration and metadata are exposed.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from pruan-rht and psalajova June 19, 2026 07:11
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2026
@mgencur mgencur force-pushed the test_CNTRLPLANE-3568_user_define_tags branch from 84ae202 to 4426b0a Compare June 19, 2026 07:13
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mgencur: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-e2e-v2-aws mgencur/hypershift presubmit Presubmit changed
pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-images mgencur/hypershift presubmit Presubmit changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml`:
- Around line 54-56: The branch name in the zz_generated_metadata section is
missing the "test_" prefix and does not match the actual PR source branch.
Update the branch field value from "CNTRLPLANE-3568_user_define_tags" to
"test_CNTRLPLANE-3568_user_define_tags" in the zz_generated_metadata block,
rename the YAML file from
"mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml" to
"mgencur-hypershift-test_CNTRLPLANE-3568_user_define_tags.yaml" to match the
branch name, then re-run "make update" to regenerate the zz_generated_metadata
and related Prow job configuration files with the corrected branch name.
🪄 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: 5fa8bdbe-86a4-4ee4-bed0-15c068163289

📥 Commits

Reviewing files that changed from the base of the PR and between ea846f6 and 84ae202.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml

Comment on lines +54 to +56
branch: CNTRLPLANE-3568_user_define_tags
org: mgencur
repo: hypershift

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Branch name in metadata does not match PR source branch.

The zz_generated_metadata.branch field and filename use CNTRLPLANE-3568_user_define_tags, but the PR source branch is test_CNTRLPLANE-3568_user_define_tags (per PR objectives). This mismatch will affect generated Prow job names and platform balancing scripts that depend on accurate branch metadata.

Correct the branch name in both the filename and zz_generated_metadata to match the actual Git branch:

  • Rename file to: mgencur-hypershift-test_CNTRLPLANE-3568_user_define_tags.yaml
  • Update zz_generated_metadata.branch to: test_CNTRLPLANE-3568_user_define_tags

Then re-run make update to regenerate zz_generated_metadata and corresponding Prow job YAML files.

🤖 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/mgencur/hypershift/mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml`
around lines 54 - 56, The branch name in the zz_generated_metadata section is
missing the "test_" prefix and does not match the actual PR source branch.
Update the branch field value from "CNTRLPLANE-3568_user_define_tags" to
"test_CNTRLPLANE-3568_user_define_tags" in the zz_generated_metadata block,
rename the YAML file from
"mgencur-hypershift-CNTRLPLANE-3568_user_define_tags.yaml" to
"mgencur-hypershift-test_CNTRLPLANE-3568_user_define_tags.yaml" to match the
branch name, then re-run "make update" to regenerate the zz_generated_metadata
and related Prow job configuration files with the corrected branch name.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mgencur: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-hypershift-main-e2e-v2-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.1-e2e-v2-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-v2-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-v2-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.22-e2e-v2-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-main-e2e-v2-gke openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.1-e2e-v2-gke openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-v2-gke openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-v2-gke openshift/hypershift presubmit Registry content changed
pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-e2e-v2-aws mgencur/hypershift presubmit Presubmit changed
pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-images mgencur/hypershift presubmit Presubmit changed
periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-v2-gke N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.23-periodics-e2e-v2-gke N/A periodic Registry content changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@mgencur

mgencur commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-e2e-v2-aws

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@mgencur: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@mgencur

mgencur commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

Added a comment on the PR: openshift/hypershift#8712 (comment)

@openshift-ci

openshift-ci Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@mgencur: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/check-gh-automation 4426b0a link true /test check-gh-automation
ci/rehearse/mgencur/hypershift/CNTRLPLANE-3568_user_define_tags/e2e-v2-aws 4426b0a link unknown /pj-rehearse pull-ci-mgencur-hypershift-CNTRLPLANE-3568_user_define_tags-e2e-v2-aws
ci/prow/config 4426b0a link true /test config
ci/prow/owners 4426b0a link true /test owners

Full PR test history. Your PR dashboard.

Details

Instructions 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.

@mgencur

mgencur commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant