Skip to content

Conversation

@neisw
Copy link
Contributor

@neisw neisw commented Dec 16, 2025

Post 4.21 branching to migrate periodic variant configurations

Generated with Claude: /migrate-variant-periodics --skip-existing 4.21 4.22

This is an alternative to DPTP-4435 while we wait to see what is possible there.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 16, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 16, 2025

@neisw: This pull request references TRT-2452 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Post 4.21 branching to migrate periodic variant configurations

Generated with Claude: /migrate-variant-periodics --skip-existing 4.21 4.22

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.

@neisw
Copy link
Contributor Author

neisw commented Dec 16, 2025

/cc @petr-muller

@openshift-ci openshift-ci bot requested a review from petr-muller December 16, 2025 12:11
@petr-muller
Copy link
Member

xref: #71837

to figure out what got missed in pre-branching

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 16, 2025
@petr-muller
Copy link
Member

I have started looking into this today, will finish tomorrow - let's refresh this PR sometimes closer to EU EoD and I'll flag it to merge?

# Conflicts:
#	ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22__periodics.yaml
#	ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22-periodics.yaml
@neisw neisw force-pushed the trt-2452-post-4.22-periodics branch from 2943d0a to 3277db9 Compare December 17, 2025 01:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 17, 2025
@neisw
Copy link
Contributor Author

neisw commented Dec 17, 2025

Looks like MCO add their jobs and caused conflicts. We can refresh again as needed.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@neisw: 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-gcp-filestore-csi-driver-operator-release-4.22-periodics-ci-index-gcp-filestore-csi-driver-operator-bundle openshift/gcp-filestore-csi-driver-operator presubmit Presubmit changed
pull-ci-openshift-insights-operator-release-4.22-periodics-images openshift/insights-operator presubmit Presubmit changed
pull-ci-openshift-image-registry-release-4.22-periodics-images openshift/image-registry presubmit Presubmit changed
pull-ci-openshift-cluster-authentication-operator-release-4.22-periodics-images openshift/cluster-authentication-operator presubmit Presubmit changed
pull-ci-openshift-csi-operator-release-4.22-periodics-ci-index-aws-efs-csi-driver-operator-bundle openshift/csi-operator presubmit Presubmit changed
pull-ci-openshift-csi-operator-release-4.22-periodics-ci-index-smb-csi-driver-operator-bundle openshift/csi-operator presubmit Presubmit changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-aws-ovn-proxy-techpreview-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-vsphere-ovn-techpreview-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-aws-ovn-upi-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-metal-ipi-ovn-bm-extended-f3 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-gcp-ovn-csi-slow-extended-f4 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-gcp-ovn-csi-extended-f3 N/A periodic Periodic changed
periodic-ci-openshift-insights-operator-release-4.22-periodics-azure-insights-runtime-extractor-tests N/A periodic Periodic changed
periodic-ci-openshift-insights-operator-release-4.22-periodics-e2e-metal-techpreview-ipv4 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-aws-ovn-upi-slow-extended-f3 N/A periodic Periodic changed
periodic-ci-openshift-cluster-authentication-operator-release-4.22-periodics-e2e-aws-sno-external-oidc-revertoauth N/A periodic Periodic changed
periodic-ci-openshift-insights-operator-release-4.22-periodics-e2e-azure-techpreview N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-azure-ovn-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-insights-operator-release-4.22-periodics-e2e-gcp-techpreview N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-aws-ovn-slow-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-olm-release-4.22-periodics-e2e-aws-ovn-techpreview-extended-f3 N/A periodic Periodic changed
periodic-ci-openshift-cluster-authentication-operator-release-4.22-periodics-e2e-aws-sno-external-oidc-configure N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-vsphere-ovn-upi-slow-extended-f2 N/A periodic Periodic changed
periodic-ci-openshift-cluster-authentication-operator-release-4.22-periodics-e2e-metal-ovn-ipv4-external-oidc-uid-extra N/A periodic Periodic changed
periodic-ci-openshift-operator-framework-operator-controller-release-4.22-periodics-e2e-azure-ovn-techpreview-extended-f1 N/A periodic Periodic changed

A total of 191 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.

Copy link
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

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

I do not think there's a good reason to not merge this before the break, so lgtm+hold and unhold as needed

/hold

Some interesting stuff I noticed:

  • Some of the configs waste resources by specifying to build some images, which causes some waste at runtime (building images that are not used) and at config time (creating presubmits and postsubmits without value)
  • It is interesting that some periodics are configured to test nightlies and some to test ci releases
  • The inclusion of cluster-node-tuning-operator periodics was a bit surprising, because the job is not configured in a way that causes the periodics to carry the job-release label, whcih I thought is the identifier for "jobs that TRT cares about".

I have created some PRs as I went to address the wasteful config:

These do not need to go first, I'll just need to followup and do the changes in the newly merged 4.22 configs as well.

Comment on lines +21 to +30
images:
- dockerfile_path: Dockerfile.rhel7
inputs:
ocp_4.22_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.22:base-rhel9
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
to: cluster-authentication-operator
Copy link
Member

Choose a reason for hiding this comment

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

I think images should not be here, the built image is not used and it will just cause an image to built (time+resources), and cause a reduntant presubmit to exist

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In general this approach just takes what exists for 4.21 and bumps it up to 4.22 without any analysis on the structure. It will be interesting to see how we can improve upon this and flag wasteful / unnecessary config in the future.

Comment on lines +31 to +35
promotion:
to:
- disabled: true
name: "4.22"
namespace: ocp
Copy link
Member

Choose a reason for hiding this comment

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

This should not be here, this will cause a reduntant postsubmit to exist.

integration:
include_built_images: true
name: "4.22"
namespace: ocp
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we have any expectations about what should the periodics test? The aws-karpenter-provide-aws tests the latest ci release, and this config builds a new ephemeral release from the integration imagestream (the ci release upstream).

Also include_built_images is useless here, the config builds no images.

Copy link
Member

Choose a reason for hiding this comment

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

Also, interestingly -- these periodics will not have the job-release: "4.22" label because it is derivative of the release.latest shape, and this config does not match.

https://github.com/neisw/release/blob/3277db9515c9f5987d2db95ac78d5cce7b0fb908/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.22-periodics.yaml#L10-L15

I thought TRT only cares about the jobs with this label.

Comment on lines +27 to +30
candidate:
product: ocp
stream: nightly
version: "4.22"
Copy link
Member

Choose a reason for hiding this comment

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

haha and this one tests nightlies

Comment on lines +20 to +34
images:
- dockerfile_path: Dockerfile.ocp
inputs:
ocp_4.22_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.22:base-rhel9
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
to: docker-registry
promotion:
to:
- disabled: true
name: "4.22"
namespace: ocp
Copy link
Member

Choose a reason for hiding this comment

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

more wasteful stuff

Comment on lines +28 to +37
images:
- dockerfile_path: Dockerfile
inputs:
ocp_4.22_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.22:base-rhel9
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
to: insights-operator
Copy link
Member

Choose a reason for hiding this comment

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

bit of a waste

requests:
cpu: 100m
memory: 200Mi
tests:
Copy link
Member

Choose a reason for hiding this comment

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

whoah 60 periodics?

requests:
cpu: 100m
memory: 200Mi
tests:
Copy link
Member

Choose a reason for hiding this comment

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

and 61 more 😬

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe they are working hard on migrating QE jobs over

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 17, 2025

@neisw: This pull request references TRT-2452 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Post 4.21 branching to migrate periodic variant configurations

Generated with Claude: /migrate-variant-periodics --skip-existing 4.21 4.22

This is an alternative to DPTP-4435 while we wait to see what is possible there.

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.

@neisw
Copy link
Contributor Author

neisw commented Dec 17, 2025

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2025
@neisw
Copy link
Contributor Author

neisw commented Dec 17, 2025

/pj-rehearse ack

@openshift-ci-robot
Copy link
Contributor

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

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Dec 17, 2025
@smg247
Copy link
Member

smg247 commented Dec 17, 2025

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neisw, petr-muller, smg247

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 Dec 17, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

@neisw: 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 40f2b23 into openshift:master Dec 17, 2025
15 checks passed
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/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