Skip to content

fix src image and rm duplicate d/s merge jobs#77336

Open
jluhrsen wants to merge 1 commit intoopenshift:mainfrom
jluhrsen:rm-dup-ds-merge-jobs
Open

fix src image and rm duplicate d/s merge jobs#77336
jluhrsen wants to merge 1 commit intoopenshift:mainfrom
jluhrsen:rm-dup-ds-merge-jobs

Conversation

@jluhrsen
Copy link
Copy Markdown
Contributor

@jluhrsen jluhrsen commented Apr 2, 2026

keeping openshift-5.0 version since that will continue to be master after branch cut as well

fixes:

  • forces jobs to use src which is from ovnk .ci-operator.yaml
  • trying to find which specific job actually ceated the PR
  • race condition where
    • the script is kicked off simultaneously and neither sees an open
      PR, so both move on to creating one.
    • one job has pushed a PR to github with it's local branch and
      the other job gets to the init step which is to delete that local
      branch (in case of a previous failed state that left a dirty/unused
      branch in github)
    • first job's PR gets deleted and second job's PR gets created and
      all the humans get confused

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 2, 2026
@jluhrsen
Copy link
Copy Markdown
Contributor Author

jluhrsen commented Apr 2, 2026

/pj-rehearse ack

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

fixes:
- forces jobs to use src which is from ovnk .ci-operator.yaml
- trying to find which specific job actually ceated the PR
- race condition where
  - the script is kicked off simultaneously and neither sees an open
    PR, so both move on to creating one.
  - one job has pushed a PR to github with it's local branch and
    the other job gets to the init step which is to delete that local
    branch (in case of a previous failed state that left a dirty/unused
    branch in github)
  - first job's PR gets deleted and second job's PR gets created and
    all the humans get confused

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
@jluhrsen jluhrsen force-pushed the rm-dup-ds-merge-jobs branch from 8e24629 to cf61d17 Compare April 2, 2026 17:47
@jluhrsen
Copy link
Copy Markdown
Contributor Author

jluhrsen commented Apr 2, 2026

/pj-rehearse

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 2, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jluhrsen
Once this PR has been reviewed and has the lgtm label, please assign knobunc for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@jluhrsen: 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
periodic-ci-openshift-ovn-kubernetes-release-5.0-periodics-downstream-merge 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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 2, 2026

@jluhrsen: The following test 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/rehearse/periodic-ci-openshift-ovn-kubernetes-release-5.0-periodics-downstream-merge cf61d17 link unknown /pj-rehearse periodic-ci-openshift-ovn-kubernetes-release-5.0-periodics-downstream-merge

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.

@jluhrsen
Copy link
Copy Markdown
Contributor Author

jluhrsen commented Apr 2, 2026

/pj-rehearse ack

the rehearsal failed because there is a real go mod issue, but it did build the root image from src which comes from our ovnk repo and will track the ci-operator.yaml which is what we want.

downside is that the build takes a little time. 15m. burns some CPU, so if that is a concern we can modify the job to use a specific image, but that will require maintenance over time.

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jluhrsen: 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 Apr 2, 2026
@jluhrsen jluhrsen changed the title rm duplicate d/s merge jobs fix src image and rm duplicate d/s merge jobs Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants