Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[redhat-3.8] chore: remove deprecated appr code (PROJQUAY-4992) #1729

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #1718

/assign dmage

@dmage dmage merged commit ce694e0 into quay:redhat-3.8 Feb 7, 2023
@dmage
Copy link
Member

dmage commented Feb 7, 2023

/cherrypick redhat-3.7

@openshift-cherrypick-robot
Copy link
Author

@dmage: #1729 failed to apply on top of branch "redhat-3.7":

Applying: chore: remove deprecated appr code (PROJQUAY-4992)
Using index info to reconstruct a base tree...
A	.github/workflows/oci-distribution-spec.yaml
M	conf/init/nginx_conf_create.py
M	conf/nginx/server-base.conf.jnj
M	config.py
M	data/appr_model/channel.py
M	endpoints/api/repository_models_pre_oci.py
M	endpoints/web.py
M	initdb.py
M	requirements.txt
M	test/fixtures.py
M	test/test_api_usage.py
M	test/testconfig.py
M	util/config/schema.py
Falling back to patching base and 3-way merge...
Auto-merging util/config/schema.py
Auto-merging test/testconfig.py
Auto-merging test/test_api_usage.py
Auto-merging test/fixtures.py
Auto-merging requirements.txt
Auto-merging initdb.py
Auto-merging endpoints/web.py
Removing endpoints/appr/test/test_registry.py
Removing endpoints/appr/test/test_digest_prefix.py
Removing endpoints/appr/test/test_appr_decorators.py
Removing endpoints/appr/test/test_api_security.py
Removing endpoints/appr/test/test_api.py
Removing endpoints/appr/registry.py
Removing endpoints/appr/models_interface.py
Removing endpoints/appr/models_cnr.py
Removing endpoints/appr/decorators.py
Removing endpoints/appr/cnr_backend.py
Removing endpoints/appr/__init__.py
Auto-merging endpoints/api/repository_models_pre_oci.py
Removing data/appr_model/test/test_appr_tag.py
Removing data/appr_model/tag.py
Removing data/appr_model/release.py
Removing data/appr_model/package.py
Removing data/appr_model/models.py
Removing data/appr_model/manifest_list.py
Removing data/appr_model/manifest.py
CONFLICT (modify/delete): data/appr_model/channel.py deleted in chore: remove deprecated appr code (PROJQUAY-4992) and modified in HEAD. Version HEAD of data/appr_model/channel.py left in tree.
Removing data/appr_model/blob.py
Removing data/appr_model/__init__.py
Auto-merging config.py
Auto-merging conf/nginx/server-base.conf.jnj
Auto-merging conf/init/nginx_conf_create.py
CONFLICT (modify/delete): .github/workflows/oci-distribution-spec.yaml deleted in HEAD and modified in chore: remove deprecated appr code (PROJQUAY-4992). Version chore: remove deprecated appr code (PROJQUAY-4992) of .github/workflows/oci-distribution-spec.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: remove deprecated appr code (PROJQUAY-4992)
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".

In response to this:

/cherrypick redhat-3.7

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.

@dmage
Copy link
Member

dmage commented Feb 7, 2023

/cherrypick redhat-3.7

@openshift-cherrypick-robot
Copy link
Author

@dmage: new pull request created: #1746

In response to this:

/cherrypick redhat-3.7

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants