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.

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

Jump to bottom

Make container content related settings configurable #17570

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Make container content related settings configurable #17570

merged 1 commit into from
Feb 25, 2025
+192 −165

Conversation

dosas
Copy link
Collaborator

@dosas dosas commented Feb 11, 2025

Problem Statement

container related settings cannot be configured via settings file

Solution

Move container related settings to yaml settings file

Related Issues

@dosas dosas added CherryPick PR needs CherryPick to previous branches 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 6.16.z Introduced in or relating directly to Satellite 6.16 labels Feb 11, 2025
@dosas dosas requested a review from vsedmik February 11, 2025 13:21
@dosas dosas requested review from a team as code owners February 11, 2025 13:21
@Satellite-QE
Copy link
Collaborator

Can one of the admins verify this patch?

@ogajduse ogajduse requested a review from Copilot February 24, 2025 13:16
Copilot
Copilot AI reviewed Feb 24, 2025
View reviewed changes

Choose a reason for hiding this comment

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

Copilot reviewed 10 out of 25 changed files in this pull request and generated no comments.

Files not reviewed (15)
  • tests/foreman/ui/test_contentview_old.py: Evaluated as low risk
  • tests/foreman/ui/test_activationkey.py: Evaluated as low risk
  • tests/foreman/api/test_product.py: Evaluated as low risk
  • tests/foreman/api/test_http_proxy.py: Evaluated as low risk
  • tests/foreman/cli/test_satellitesync.py: Evaluated as low risk
  • tests/foreman/ui/test_containerimagetag.py: Evaluated as low risk
  • tests/foreman/api/test_docker.py: Evaluated as low risk
  • tests/foreman/cli/test_capsulecontent.py: Evaluated as low risk
  • tests/foreman/cli/test_docker.py: Evaluated as low risk
  • tests/foreman/api/test_contentviewfilter.py: Evaluated as low risk
  • tests/foreman/cli/test_container_management.py: Evaluated as low risk
  • tests/foreman/cli/test_vm_install_products_package.py: Evaluated as low risk
  • tests/foreman/api/test_contentview.py: Evaluated as low risk
  • tests/foreman/cli/test_contentview.py: Evaluated as low risk
  • tests/foreman/api/test_repository.py: Evaluated as low risk
ogajduse
ogajduse requested changes Feb 24, 2025
View reviewed changes
@ogajduse
Copy link
Member 

trigger: test-robottelo
pytest: tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_capsule_sync_openstack_container_repos tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_content_counts_for_mixed_cv tests/foreman/api/test_repository.py::TestDockerRepository::test_positive_synchronize_docker_repo_with_manifest_labels tests/foreman/api/test_repository.py::TestDockerRepository::test_negative_synchronize_docker_repo_with_mix_valid_invalid_tags tests/foreman/api/test_docker.py::TestDockerRepository::test_positive_create_with_name tests/foreman/ui/test_sync.py::test_positive_sync_docker_via_sync_status

@ogajduse
Copy link
Member

trigger: test-robottelo
pytest: tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_capsule_sync_openstack_container_repos tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_content_counts_for_mixed_cv tests/foreman/api/test_repository.py::TestDockerRepository::test_positive_synchronize_docker_repo_with_manifest_labels tests/foreman/api/test_repository.py::TestDockerRepository::test_negative_synchronize_docker_repo_with_mix_valid_invalid_tags tests/foreman/api/test_docker.py::TestDockerRepository::test_positive_create_with_name tests/foreman/ui/test_sync.py::test_positive_sync_docker_via_sync_status

@dosas dosas force-pushed the make-container-settings-configurable branch from 71fdb58 to be7ea76 Compare February 25, 2025 08:16
@dosas dosas requested a review from ogajduse February 25, 2025 08:17
@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 10302
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_capsule_sync_openstack_container_repos tests/foreman/api/test_capsulecontent.py::TestCapsuleContentManagement::test_positive_content_counts_for_mixed_cv tests/foreman/api/test_repository.py::TestDockerRepository::test_positive_synchronize_docker_repo_with_manifest_labels tests/foreman/api/test_repository.py::TestDockerRepository::test_negative_synchronize_docker_repo_with_mix_valid_invalid_tags tests/foreman/api/test_docker.py::TestDockerRepository::test_positive_create_with_name tests/foreman/ui/test_sync.py::test_positive_sync_docker_via_sync_status --external-logging
Test Result: ====== 1 failed, 10 passed, 144 warnings, 3 errors in 1882.20s (0:31:22) =======

ogajduse
ogajduse requested changes Feb 25, 2025
View reviewed changes
vsedmik
vsedmik approved these changes Feb 25, 2025
View reviewed changes
Copy link
Contributor

@vsedmik vsedmik left a comment

Choose a reason for hiding this comment

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

The renames seem matching to me, PRT failures are unrelated.
One comment from @ogajduse pending, otherwise looks ok. 👍

@dosas dosas force-pushed the make-container-settings-configurable branch from be7ea76 to 6011255 Compare February 25, 2025 12:09
@dosas dosas requested a review from ogajduse February 25, 2025 12:09
@dosas dosas force-pushed the make-container-settings-configurable branch from 6011255 to 109fc4f Compare February 25, 2025 12:10
ogajduse
ogajduse approved these changes Feb 25, 2025
View reviewed changes
Copy link
Member

@ogajduse ogajduse left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you for your contribution!

@ogajduse ogajduse merged commit fc02e89 into SatelliteQE:master Feb 25, 2025
9 checks passed
@Satellite-QE Satellite-QE mentioned this pull request Feb 25, 2025
Closed
github-actions bot pushed a commit that referenced this pull request Feb 25, 2025
@dosas @web-flow
Make container content related settings configurable (#17570)
c8bc53b 
(cherry picked from commit fc02e89)
@Satellite-QE Satellite-QE mentioned this pull request Feb 25, 2025
Closed
This was referenced Feb 25, 2025
Merged
Closed
dosas added a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570)
c7a6f98
dosas added a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570)
f4f5158
dosas added a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570)
9848732
dosas added a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570)
2c88a42
dosas added a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570)
3c55640
ogajduse pushed a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570) (#17688)
ee79ebe
ogajduse pushed a commit that referenced this pull request Feb 25, 2025
@dosas
Make container content related settings configurable (#17570) (#17690)
9622db4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot Copilot left review comments

@ogajduse ogajduse ogajduse approved these changes

@vsedmik vsedmik vsedmik approved these changes

Assignees

@dosas dosas

Labels
6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 6.16.z Introduced in or relating directly to Satellite 6.16 6.17.z CherryPick PR needs CherryPick to previous branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dosas @Satellite-QE @ogajduse @vsedmik