Skip to content

[release-4.15] USHIFT-3119: Fix problems related to the osbuild version upgrade#3303

Merged
openshift-merge-bot[bot] merged 6 commits intoopenshift:release-4.15from
ggiguash:415_fix_osbuilder
Apr 30, 2024
Merged

[release-4.15] USHIFT-3119: Fix problems related to the osbuild version upgrade#3303
openshift-merge-bot[bot] merged 6 commits intoopenshift:release-4.15from
ggiguash:415_fix_osbuilder

Conversation

@ggiguash
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash commented Apr 30, 2024

pmtk and others added 6 commits April 30, 2024 17:08
@pmtk @ggiguash
Fix restart_job so it's aware of warnings printed to stdout
3709d59
@pmtk @pacevedom @ggiguash
Use generator instead of list comprehension
11fc55e 
Co-authored-by: Pablo Acevedo Montserrat <pabloacevedom@gmail.com>
@pmtk @ggiguash
Don't stop the socket - it can cause composer to keep restarting and …
7993af1 
…failing

Disabling socket can cause composer to fail the shutdown and result in
multiple restarts that fail and block later start (at the end of the
script).
Instead, stop workers first to keep composer from reactivating via
socket, then stop the composer.
@pmtk @ggiguash
When selecting compose ID select only valid line
b9bc39e
@pmtk @ggiguash
Check if wait_images.py returned right amount of IDs
8c8e481
@pmtk @ggiguash
Return 1 if aliasing failed
a6ac5fe
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 30, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 30, 2024 •
edited by openshift-ci Bot
Loading

@ggiguash: This pull request references USHIFT-3119 which is a valid jira issue.

Details

In response to this:

Manual cherrypick of:

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 dhellmann and jerpeter1 April 30, 2024 14:18
@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Apr 30, 2024

/label backport-risk-assessed
/label jira/valid-bug

@openshift-ci openshift-ci Bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 30, 2024
pacevedom
pacevedom approved these changes Apr 30, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pacevedom

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

@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Apr 30, 2024

/label cherrypick-approve
/cherrypick release-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Apr 30, 2024

@ggiguash: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

Details

In response to this:

/label cherrypick-approve
/cherrypick release-4.14

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/test-infra repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2024

@ggiguash: The label(s) /label cherrypick-approve cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/invalid-bug, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label cherrypick-approve
/cherrypick release-4.14

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/test-infra repository.

@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Apr 30, 2024

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 30, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2024

@ggiguash: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit ba35231 into openshift:release-4.15 Apr 30, 2024
@ggiguash ggiguash deleted the 415_fix_osbuilder branch April 30, 2024 16:31
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Apr 30, 2024

@ggiguash: new pull request created: #3304

Details

In response to this:

/label cherrypick-approve
/cherrypick release-4.14

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/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pacevedom pacevedom pacevedom approved these changes

@dhellmann dhellmann Awaiting requested review from dhellmann

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

Assignees

@pacevedom pacevedom

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ggiguash @openshift-ci-robot @openshift-cherrypick-robot @pacevedom @pmtk