Skip to content

Add support for python repository error-on-reject #1459

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.

Sign up for GitHub

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

Open
gerrod3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for python repository error-on-reject #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/+error-on-reject.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added `--error-on-reject`/`--no-error-on-reject` options to `pulp python repository`.
2 changes: 2 additions & 0 deletions pulp-glue/src/pulp_glue/python/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ def preprocess_entity(self, body: EntityDefinition, partial: bool = False) -> En
body = super().preprocess_entity(body, partial=partial)
if "allow_package_substitution" in body:
self.pulp_ctx.needs_plugin(PluginRequirement("python", specifier=">=3.28.0"))
if "error_on_reject" in body:
self.pulp_ctx.needs_plugin(PluginRequirement("python", specifier=">=3.34.0"))
return body

def repair_metadata(self) -> t.Any:
Expand Down
10 changes: 10 additions & 0 deletions src/pulpcore/cli/python/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,16 @@ def repository() -> None:
" different checksum. When blocked, such operations are rejected."
),
),
pulp_option(
"--error-on-reject/--no-error-on-reject",
needs_plugins=[PluginRequirement("python", specifier=">=3.34.0")],
default=None,
help=_(
"Fail the entire repository version when packages are rejected by the"
" package substitution or blocklist policies. When disabled, rejected"
" packages are skipped and remaining packages are added."
),
),
retained_versions_option,
pulp_labels_option,
]
Expand Down
8 changes: 8 additions & 0 deletions tests/scripts/pulp_python/test_repository.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,12 @@ if pulp debug has-plugin --name "python" --specifier ">=3.28.0"; then
expect_succ test "$(echo "$OUTPUT" | jq -r '.allow_package_substitution')" = "false"
fi

if pulp debug has-plugin --name "python" --specifier ">=3.34.0"; then
expect_succ pulp python repository show --repository "cli_test_python_repo"
expect_succ test "$(echo "$OUTPUT" | jq -r '.error_on_reject')" = "true"
expect_succ pulp python repository update --repository "cli_test_python_repo" --no-error-on-reject
expect_succ pulp python repository show --repository "cli_test_python_repo"
expect_succ test "$(echo "$OUTPUT" | jq -r '.error_on_reject')" = "false"
fi

expect_succ pulp python repository destroy --name "cli_test_python_repo"
Loading