Skip to content

OCPBUGS-84114: Add hypershift-openstack-gather step#80419

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
shiftstack:fix-hypershift-gate
Jun 12, 2026
Merged

OCPBUGS-84114: Add hypershift-openstack-gather step#80419
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
shiftstack:fix-hypershift-gate

Conversation

@stephenfin

@stephenfin stephenfin commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Add and enable a new hypershift-openstack-gather step to the OpenStack HCP jobs. This allows us to gather information about cluster post-delete, which can help us prove some theories regarding

While here, document the RHCOS_IMAGE_NAME option and clear its default. This confused me. We might want to drop testing of 4.18 (and subsequently this option) since it's dev preview but that's left to another PR.

Summary by CodeRabbit

This PR updates OpenShift CI configuration for Hypershift OpenStack Hosted Control Plane (HCP) workflows to add a short, best-effort diagnostic gather step and to make passing the OpenStack RHCOS image name to E2E tests conditional.

Practical impact

  • Adds a new optional post-test step, hypershift-openstack-gather, to the Hypershift OpenStack e2e workflow. The step is best-effort, optional on success, has a 5m timeout, runs the cli: latest gather script, and writes artifacts to ARTIFACT_DIR/capo-gather. It snapshots CAPO (OpenStackCluster/OpenStackMachine/OpenStackServer), CAPI (clusters.cluster.x-k8s.io/machines.cluster.x-k8s.io), ORC (images.openstack.k-orc.cloud), hostedclusters, nodepools, and namespaces stuck in Terminating to aid debugging of deletions and finalizer-related failures.
  • The e2e execute script now passes --e2e.openstack-node-image-name only when RHCOS_IMAGE_NAME is explicitly set (uses Bash parameter expansion), avoiding passing an empty or unintended value to tests.
  • Clears the default value of RHCOS_IMAGE_NAME (was "rhcos-latest-hcp-nodepool") and expands its documentation to explain when the Glance image name is used across OpenStack versions and which tests consume or ignore it.
  • Adds OWNERS and metadata for the new gather step, assigning openstack-approvers as approvers and openstack-reviewers as reviewers.

Scope and affected CI config

  • Changes are limited to Hypershift OpenStack CI config and step-registry:
    • ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml — integrates the gather step into the e2e job post section.
    • ci-operator/step-registry/hypershift/openstack/gather/ — new gather script, step ref YAML, metadata JSON, and OWNERS.
    • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh — conditional CLI flag passing.
    • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml — RHCOS_IMAGE_NAME default cleared and documentation added.

Why this matters

  • The gather step provides targeted artifacts after failures to speed triage of deletion/finalizer issues in OpenStack HCP jobs.
  • Making the RHCOS image name flag conditional and removing its misleading default reduces accidental misconfiguration and aligns behavior across OpenStack versions.

Notes

  • The PR notes that testing of 4.18 (and the RHCOS_IMAGE_NAME option) might be removed in a future PR; that change is not included here.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@stephenfin: This pull request references Jira Issue OCPBUGS-84114, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Add and enable a new hypershift-openstack-gather step to the OpenStack HCP jobs. This allows us to gather information about cluster post-delete, which can help us prove some theories regarding

While here, document the RHCOS_IMAGE_NAME option and clear its default. This confused me. We might want to drop testing of 4.18 (and subsequently this option) since it's dev preview but that's left to another PR.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested review from enxebre and mandre June 11, 2026 14:19
@coderabbitai

coderabbitai Bot commented Jun 11, 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: 6b9d6d17-211d-4b23-8367-6ad61d79b525

📥 Commits

Reviewing files that changed from the base of the PR and between d7ca9ea and adde328.

📒 Files selected for processing (7)
  • ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml
  • ci-operator/step-registry/hypershift/openstack/gather/OWNERS
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-commands.sh
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.metadata.json
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.yaml
✅ Files skipped from review due to trivial changes (1)
  • ci-operator/step-registry/hypershift/openstack/gather/OWNERS
🚧 Files skipped from review as they are similar to previous changes (6)
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.yaml
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.metadata.json
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-commands.sh
  • ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

Walkthrough

PR adds a new OpenStack forensic gather step to HyperShift CI, makes RHCOS_IMAGE_NAME optional for E2E runs, and wires the gather step into the e2e-openstack-aws job's post-test workflow before destroy.

Changes

OpenStack E2E Testing Enhancement

Layer / File(s) Summary
E2E test parameter flexibility
ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml, ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh
RHCOS_IMAGE_NAME default changed to "" with documentation; E2E command now includes --e2e.openstack-node-image-name only when RHCOS_IMAGE_NAME is non-empty.
New OpenStack gather step (implementation)
ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-commands.sh
New script validates KUBECONFIG, creates ${ARTIFACT_DIR}/capo-gather, and gathers Terminating namespaces, hostedclusters/nodepools, CAPI clusters/machines, CAPO openstack resources, and ORC images into deterministic YAML files.
New OpenStack gather step (registry & metadata)
ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.yaml, ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.metadata.json, ci-operator/step-registry/hypershift/openstack/gather/OWNERS
Adds a hypershift-openstack-gather step-ref (best_effort, optional_on_success, resource requests, timeout) and metadata linking openstack-approvers/openstack-reviewers, plus OWNERS.
Job workflow integration
ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
Adds a post block to e2e-openstack-aws to run hypershift-openstack-gather (ref) and then chain hypershift-destroy-nested-management-cluster.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Suggested labels

lgtm, approved

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: adding a new hypershift-openstack-gather step to the CI configuration for collecting diagnostic information after OpenStack HCP e2e tests.
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 PR changes only hypershift CI YAML/bash scripts; no Go/Ginkgo test code changed, and searching modified files found no It/Describe/Context/When titles with dynamic content.
Test Structure And Quality ✅ Passed PR changes are limited to ci-operator YAML/Bash step configs; no Ginkgo/Gomega test files (imports or *_test.go patterns) are present to review quality requirements.
Microshift Test Compatibility ✅ Passed PR only updates Hypershift CI YAML/Bash and metadata (7 files); no Go/Ginkgo e2e tests are added, so MicroShift API compatibility issues are not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. Changes are limited to CI configuration (YAML), test execution script parameter handling, and new log-gathering scripts, all of which do not contain te...
Topology-Aware Scheduling Compatibility ✅ Passed Reviewed PR-related CI YAML and step scripts; they add post steps and conditional CLI flags but contain no affinity/topologySpreadConstraints/nodeSelector/master-control-plane scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The OTE Binary Stdout Contract check applies only to Go binaries communicating via JSON with openshift-tests. This PR contains only YAML configuration and bash CI scripts with no Go code or OTE bin...
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR #80419 only changes CI/YAML and bash step-registry files and adds no Go/Ginkgo e2e tests, so the IPv6/disconnected test compatibility check is not applicable.
No-Weak-Crypto ✅ Passed No weak cryptography usage detected. PR contains only CI/CD configuration and diagnostic shell scripts with no cryptographic operations, weak algorithms, or insecure comparisons.
Container-Privileges ✅ Passed No container privilege indicators (privileged, hostPID/hostNetwork/hostIPC, SYS_ADMIN, allowPrivilegeEscalation, securityContext) found in the PR’s changed files (incl. gather-ref.yaml).
No-Sensitive-Data-In-Logs ✅ Passed Gather script only echoes status (e.g., kubeconfig missing, resource headings) and redirects oc get -o yaml output to ${ARTIFACT_DIR}/capo-gather; no password/token/PII logging found in changed files.

✏️ 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-robot

Copy link
Copy Markdown
Contributor

@stephenfin: This pull request references Jira Issue OCPBUGS-84114, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

Add and enable a new hypershift-openstack-gather step to the OpenStack HCP jobs. This allows us to gather information about cluster post-delete, which can help us prove some theories regarding

While here, document the RHCOS_IMAGE_NAME option and clear its default. This confused me. We might want to drop testing of 4.18 (and subsequently this option) since it's dev preview but that's left to another PR.

Summary by CodeRabbit

This PR enhances the OpenStack HCP (Hosted Control Plane) CI infrastructure by adding a post-test diagnostic step and improving configuration clarity.

Key Changes:

  1. New hypershift-openstack-gather step: Adds a new diagnostic step to OpenStack HCP e2e jobs that runs after test completion to collect and export debugging information from the management cluster. This step gathers CAPO (Cluster API Provider OpenStack), ORC (OpenStack Resource Controller), and related Kubernetes resources to help investigate cluster state and identify objects blocked by finalizers. The step is marked as best-effort and optional on success, with a 5-minute timeout.

  2. RHCOS_IMAGE_NAME configuration improvements:

  • Clears the misleading default value of RHCOS_IMAGE_NAME from "rhcos-latest-hcp-nodepool" to an empty string
  • Makes the CLI argument conditionally passed to the e2e test only when this variable is explicitly set
  • Adds documentation explaining when this variable applies (OpenStack versions and which e2e tests consume it)
  • This resolves confusion caused by the default value being inappropriate for newer Kubernetes versions where the flag behavior changed
  1. Job workflow updates: Integrates the new gather step into the e2e-openstack-aws test pipeline, ensuring diagnostic collection happens automatically after test execution.

The changes are scoped to OpenStack HCP job configuration and include proper ownership/reviewer metadata for governance.

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 openshift-eng/jira-lifecycle-plugin repository.

@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/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-commands.sh`:
- Around line 5-8: The file check using KUBECONFIG can fail under set -u when
the variable is unset; update the guard to use safe parameter expansion and
check for emptiness first, e.g. replace the if [[ ! -f "${KUBECONFIG}" ]] test
with a combined safe check using "${KUBECONFIG:-}" (for example: if [[ -z
"${KUBECONFIG:-}" || ! -f "${KUBECONFIG}" ]]; then ... ) so the script won’t
error on unbound KUBECONFIG and will still skip the gather path; adjust the
echo/exit behavior in the same block that references KUBECONFIG.
🪄 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: 7cd6d984-fbcc-4896-bb08-d6d5aff37f69

📥 Commits

Reviewing files that changed from the base of the PR and between 51b034f and 859a7b1.

📒 Files selected for processing (7)
  • ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml
  • ci-operator/step-registry/hypershift/openstack/gather/OWNERS
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-commands.sh
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.metadata.json
  • ci-operator/step-registry/hypershift/openstack/gather/hypershift-openstack-gather-ref.yaml

@stephenfin stephenfin force-pushed the fix-hypershift-gate branch from 859a7b1 to d7ca9ea Compare June 11, 2026 14:34
stephenfin and others added 2 commits June 12, 2026 13:50
RHCOS_IMAGE_NAME fed --e2e.openstack-node-image-name, which was wired
into DefaultOpenStackOptions() on 4.18 and earlier. Since e12e00159
(4.19+) ORC manages the image lifecycle directly for TestCreateCluster
and TestNodePool, so the flag is no longer consumed by those tests.
TestOpenStackAdvancedTest still honours it but is not in the default
E2E_TESTS_REGEX.

Clear the misleading "rhcos-latest-hcp-nodepool" default to "" and only
pass the flag when the variable is non-empty. The 4.18 job configs that
explicitly set RHCOS_IMAGE_NAME to a versioned image name are unaffected.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This is vaguely based on the hypershift-analyze-e2e-failure step but
much simpler (no AI integration).

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
@stephenfin stephenfin force-pushed the fix-hypershift-gate branch from d7ca9ea to adde328 Compare June 12, 2026 12:54
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@stephenfin: 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-machine-config-operator-main-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-5.1-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-5.0-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.23-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.22-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.21-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.20-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.19-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.18-e2e-openstack-hypershift openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-main-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-5.1-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-5.0-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-4.23-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-4.22-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-4.21-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-4.20-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-openstack-resource-controller-release-4.19-e2e-hypershift openshift/openstack-resource-controller presubmit Registry content changed
pull-ci-openshift-hypershift-main-e2e-openstack-aws openshift/hypershift presubmit Ci-operator config changed
pull-ci-openshift-hypershift-release-5.1-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.22-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.21-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.20-e2e-openstack-aws openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.19-e2e-openstack-aws openshift/hypershift presubmit Registry content changed

A total of 42 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

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.

@mandre mandre left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2026
@stephenfin

Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

We have set both best_effort and optional_on_success to true so this new post step shouldn't introduce new failures even if it's buggy. We need this to help debug failures in openshift/hypershift#8687 so let's just get it in.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 12, 2026
@stephenfin

Copy link
Copy Markdown
Contributor Author

/approve

@csrwng

csrwng commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@jparrill

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, jparrill, mandre, stephenfin

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 57b22aa and 2 for PR HEAD adde328 in total

@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

@stephenfin: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 3a10dec into openshift:main Jun 12, 2026
16 checks passed
@openshift-merge-bot openshift-merge-bot Bot deleted the fix-hypershift-gate branch June 12, 2026 15:25
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@stephenfin: Jira Issue OCPBUGS-84114: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-84114 has been moved to the MODIFIED state.

Details

In response to this:

Add and enable a new hypershift-openstack-gather step to the OpenStack HCP jobs. This allows us to gather information about cluster post-delete, which can help us prove some theories regarding

While here, document the RHCOS_IMAGE_NAME option and clear its default. This confused me. We might want to drop testing of 4.18 (and subsequently this option) since it's dev preview but that's left to another PR.

Summary by CodeRabbit

This PR updates OpenShift CI configuration for Hypershift OpenStack Hosted Control Plane (HCP) workflows to add a short, best-effort diagnostic gather step and to make passing the OpenStack RHCOS image name to E2E tests conditional.

Practical impact

  • Adds a new optional post-test step, hypershift-openstack-gather, to the Hypershift OpenStack e2e workflow. The step is best-effort, optional on success, has a 5m timeout, runs the cli: latest gather script, and writes artifacts to ARTIFACT_DIR/capo-gather. It snapshots CAPO (OpenStackCluster/OpenStackMachine/OpenStackServer), CAPI (clusters.cluster.x-k8s.io/machines.cluster.x-k8s.io), ORC (images.openstack.k-orc.cloud), hostedclusters, nodepools, and namespaces stuck in Terminating to aid debugging of deletions and finalizer-related failures.
  • The e2e execute script now passes --e2e.openstack-node-image-name only when RHCOS_IMAGE_NAME is explicitly set (uses Bash parameter expansion), avoiding passing an empty or unintended value to tests.
  • Clears the default value of RHCOS_IMAGE_NAME (was "rhcos-latest-hcp-nodepool") and expands its documentation to explain when the Glance image name is used across OpenStack versions and which tests consume or ignore it.
  • Adds OWNERS and metadata for the new gather step, assigning openstack-approvers as approvers and openstack-reviewers as reviewers.

Scope and affected CI config

  • Changes are limited to Hypershift OpenStack CI config and step-registry:
  • ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml — integrates the gather step into the e2e job post section.
  • ci-operator/step-registry/hypershift/openstack/gather/ — new gather script, step ref YAML, metadata JSON, and OWNERS.
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-commands.sh — conditional CLI flag passing.
  • ci-operator/step-registry/hypershift/openstack/e2e/execute/hypershift-openstack-e2e-execute-ref.yaml — RHCOS_IMAGE_NAME default cleared and documentation added.

Why this matters

  • The gather step provides targeted artifacts after failures to speed triage of deletion/finalizer issues in OpenStack HCP jobs.
  • Making the RHCOS image name flag conditional and removing its misleading default reduces accidental misconfiguration and aligns behavior across OpenStack versions.

Notes

  • The PR notes that testing of 4.18 (and the RHCOS_IMAGE_NAME option) might be removed in a future PR; that change is not included here.

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 openshift-eng/jira-lifecycle-plugin repository.

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. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants