Skip to content

Commit

Permalink
Fixes #37099 - Update repo fixture URL to Pulp hosted for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
YOUR NAME committed Mar 7, 2024
1 parent 6420cf8 commit 9e5b494
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_yum_refresh_simplified
::Katello::Pulp3::Repository.any_instance.stubs(:generate_backend_object_name).returns(@yum_simplified_acs.name)
::Katello::Pulp3::AlternateContentSource.any_instance.stubs(:generate_backend_object_name).returns(@yum_simplified_acs.name)
repo = katello_repositories(:fedora_17_x86_64_duplicate)
repo.root.update!(url: 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
repo.root.update!(url: 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
smart_proxy_acs = ::Katello::SmartProxyAlternateContentSource.create(alternate_content_source_id: @yum_simplified_acs.id, smart_proxy_id: @primary.id, repository_id: repo.id)
ForemanTasks.sync_task(::Actions::Pulp3::Orchestration::AlternateContentSource::Create, smart_proxy_acs)
ForemanTasks.sync_task(::Actions::Pulp3::Orchestration::AlternateContentSource::Refresh, smart_proxy_acs)
Expand Down
6 changes: 3 additions & 3 deletions test/actions/pulp3/orchestration/copy_all_units_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ def setup
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.update!(:environment_id => nil)
@repo.root.update!(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
@repo_clone = katello_repositories(:fedora_17_x86_64_dev)
@repo_clone.update!(:environment_id => nil)
@repo_clone.root.update!(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo_clone.root.update!(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')

ensure_creatable(@repo, @primary)
create_repo(@repo, @primary)
Expand Down Expand Up @@ -575,7 +575,7 @@ def test_module_streams_copied_from_actual_source_repo
FactoryBot.create(:katello_content_view_module_stream_filter_rule,
:filter => filter,
:module_stream => duck)
@repo.root.update!(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')

sync_args = {:smart_proxy_id => @primary.id, :repo_id => @repo.id}
ForemanTasks.sync_task(::Actions::Pulp3::Orchestration::Repository::Sync, @repo, @primary, sync_args)
Expand Down
2 changes: 1 addition & 1 deletion test/actions/pulp3/orchestration/export_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def setup
Setting[:ssl_priv_key] = '/etc/foreman/client_key.pem'
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.root.update!(url: 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(url: 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
@repo = create_and_sync(@repo, @primary)
@content_view = @repo.content_view
@content_view_version = @repo.content_view_version
Expand Down
4 changes: 2 additions & 2 deletions test/actions/pulp3/orchestration/multi_copy_all_units_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ def setup
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.update!(:environment_id => nil)
@repo.root.update!(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
@repo_clone = katello_repositories(:fedora_17_x86_64_dev)
@repo_clone.update!(:environment_id => nil)
@repo_clone.root.update!(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo_clone.root.update!(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')

::Katello::Repository.any_instance.stubs(:soft_copy_of_library?).returns(false)

Expand Down
2 changes: 1 addition & 1 deletion test/actions/pulp3/orchestration/yum_sync_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def setup
User.current = users(:admin)
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.root.update!(url: 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(url: 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
create_repo(@repo, @primary)
ForemanTasks.sync_task(
::Actions::Katello::Repository::MetadataGenerate, @repo)
Expand Down
2 changes: 1 addition & 1 deletion test/actions/pulp3/repository/repair_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def setup
User.current = users(:admin)
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.root.update!(url: 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update!(url: 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
create_repo(@repo, @primary)
ForemanTasks.sync_task(
::Actions::Katello::Repository::MetadataGenerate, @repo)
Expand Down
2 changes: 1 addition & 1 deletion test/lib/tasks/pulpcore/repository_vcr_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def setup

@primary = SmartProxy.pulp_primary
@library_repo = katello_repositories(:fedora_17_x86_64_duplicate)
@library_repo.root.update(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@library_repo.root.update(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
@backend_service = ::Katello::Pulp3::Repository::Yum.new(@library_repo, @primary)

ENV['COMMIT'] = nil
Expand Down
2 changes: 1 addition & 1 deletion test/services/katello/pulp3/rpm_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class RpmTest < ActiveSupport::TestCase
def setup
@primary = SmartProxy.pulp_primary
@repo = katello_repositories(:fedora_17_x86_64_duplicate)
@repo.root.update(:url => 'https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/')
@repo.root.update(:url => 'https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/')
ensure_creatable(@repo, @primary)
create_repo(@repo, @primary)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"name": "Library"
},
"content_type": "yum",
"url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/",
"url": "https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/",
"arch": "noarch",
"content_id": "1597685535659",
"auto_enabled": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"name": "Library"
},
"content_type": "yum",
"url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/",
"url": "https://fixtures.pulpproject.org/rpm-advisory-diffpkgs/",
"arch": "noarch",
"os_versions": [],
"content_id": "1664981648561",
Expand Down

0 comments on commit 9e5b494

Please sign in to comment.