Skip to content

[ART-9923] set dockerfile_fallback#5002

Merged
ashwindasr merged 3 commits intoopenshift-eng:openshift-4.17from
ashwindasr:refactor-upstream-dockerfile
Jul 1, 2024
Merged

[ART-9923] set dockerfile_fallback#5002
ashwindasr merged 3 commits intoopenshift-eng:openshift-4.17from
ashwindasr:refactor-upstream-dockerfile

Conversation

@ashwindasr
Copy link
Contributor

@ashwindasr ashwindasr commented Jun 25, 2024

Alongside openshift-eng/art-tools#718

Upstream Dockerfiles are sometimes incorrectly named as .rhel7 or .rhel8 when their actual contents are rhel9. Having this option will allow us to mass open upstream PRs, without the need to coordinate PR merge with ocp-build-data, hence avoiding rebase errors.

Test with just one image for now

@openshift-bot
Copy link

Validating 5 file(s)...
Validating images/csi-snapshot-validation-webhook.yml...
Traceback (most recent call last):
File "/usr/local/bin/validate-ocp-build-data", line 33, in
sys.exit(load_entry_point('rh-ocp-build-data-validator==0.2.5', 'console_scripts', 'validate-ocp-build-data')())
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 87, in main
validate(f, args.exclude_vpn, args.schema_only)
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 23, in validate
support.fail_validation(msg, parsed)
File "/usr/local/lib/python3.9/site-packages/validator/support.py", line 14, in fail_validation
raise exceptions.ValidationFailed(msg)
validator.exceptions.ValidationFailed: Schema mismatch: images/csi-snapshot-validation-webhook.yml
Returned error: Additional properties are not allowed ('dockerfile_fallback' was unexpected)

@ashwindasr ashwindasr changed the title set dockerfile_fallback [ART-9923] set dockerfile_fallback Jun 25, 2024
@ashwindasr
Copy link
Contributor Author

/hold

Need to update the list to components that have moved to golang 1.22

@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 Jun 25, 2024
@openshift-bot
Copy link

Validating 1 file(s)...
Validating images/ose-azure-workload-identity-webhook.yml...
Traceback (most recent call last):
File "/usr/local/bin/validate-ocp-build-data", line 33, in
sys.exit(load_entry_point('rh-ocp-build-data-validator==0.2.5', 'console_scripts', 'validate-ocp-build-data')())
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 87, in main
validate(f, args.exclude_vpn, args.schema_only)
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 23, in validate
support.fail_validation(msg, parsed)
File "/usr/local/lib/python3.9/site-packages/validator/support.py", line 14, in fail_validation
raise exceptions.ValidationFailed(msg)
validator.exceptions.ValidationFailed: Schema mismatch: images/ose-azure-workload-identity-webhook.yml
Returned error: Additional properties are not allowed ('dockerfile_fallback' was unexpected)

@ashwindasr ashwindasr added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 25, 2024
@ashwindasr
Copy link
Contributor Author

/unhold

test with just one image for now

@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 Jun 25, 2024
@joepvd
Copy link
Contributor

joepvd commented Jul 1, 2024

/lgtm
/approve
/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

/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
@ashwindasr ashwindasr merged commit 95d2285 into openshift-eng:openshift-4.17 Jul 1, 2024
@ashwindasr ashwindasr deleted the refactor-upstream-dockerfile branch July 1, 2024 19:43
@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.16

@openshift-cherrypick-robot

@ashwindasr: new pull request created: #5035

Details

In response to this:

/cherry-pick openshift-4.16

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.

@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.15

@openshift-cherrypick-robot

@ashwindasr: #5002 failed to apply on top of branch "openshift-4.15":

Applying: set dockerfile_fallback
Applying: Revert "set dockerfile_fallback"
Applying: set dockerfile_fallback
Using index info to reconstruct a base tree...
M	images/ose-azure-workload-identity-webhook.yml
Falling back to patching base and 3-way merge...
Auto-merging images/ose-azure-workload-identity-webhook.yml
CONFLICT (content): Merge conflict in images/ose-azure-workload-identity-webhook.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 set dockerfile_fallback
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick openshift-4.15

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.

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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants