Skip to content

Conversation

@ashwindasr
Copy link
Contributor

@ashwindasr ashwindasr commented Jun 25, 2024

Alongside openshift-eng/ocp-build-data#5002

Upstream Dockerfiles are sometimes incorrectly named as .rhel7 or .rhel8 when their actual contents are rhel9. Added a new dockerfile_fallback field in ocp-build-data, so that we can raise upstream PRs without the need for coordinating the PR merge with ocp-build-data

Changes in this PR:

  • Refactor the logic to find the dockerfile name to resolve_dockerfile_name in doozer utils.py
  • Use that function in rebase and upstream pr logic so that we consistently give back the same name

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 25, 2024
@ashwindasr ashwindasr changed the title support dockerfile_fallback field [ART-9923] support dockerfile_fallback field Jun 25, 2024
@ashwindasr ashwindasr marked this pull request as ready for review June 25, 2024 15:07
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 25, 2024
@ashwindasr ashwindasr force-pushed the refactor-upstream-dockerfile branch from 7d274b9 to 7cfb9d8 Compare July 1, 2024 18:04
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 1, 2024

@ashwindasr: 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/prow/security 7cfb9d8 link false /test security

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.

@joepvd
Copy link
Contributor

joepvd commented Jul 1, 2024

/lgtm
/approve
setting:
/hold
please unhold at will

@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 Jul 1, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joepvd

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 Jul 1, 2024
@ashwindasr
Copy link
Contributor Author

test build succeeded, not breaking existing functionality

@ashwindasr
Copy link
Contributor Author

/unhold

@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 Jul 1, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit e4d495b into openshift-eng:main Jul 1, 2024
@ashwindasr ashwindasr deleted the refactor-upstream-dockerfile branch July 1, 2024 19:43
@ashwindasr ashwindasr mentioned this pull request Jul 16, 2024
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants