From 1cd2af96cbcb72488252293269c959116915c34c Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 28 Mar 2024 13:25:46 -0400 Subject: [PATCH] Fixes #37099 - Update repo fixture URL to Pulp hosted for tests --- .../orchestration/alternate_content_source_refresh_test.rb | 2 +- test/actions/pulp3/orchestration/copy_all_units_test.rb | 6 +++--- test/actions/pulp3/orchestration/export_test.rb | 2 +- .../pulp3/orchestration/multi_copy_all_units_test.rb | 4 ++-- test/actions/pulp3/orchestration/yum_sync_test.rb | 2 +- test/actions/pulp3/repository/repair_test.rb | 2 +- test/lib/tasks/pulpcore/repository_vcr_test.rb | 2 +- test/services/katello/pulp3/rpm_test.rb | 2 +- .../__tests__/contentViewDetailRepos.fixtures.json | 2 +- .../Compare/__tests__/cvCompareRepositories.fixtures.json | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb b/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb index 275e95b6b9f..df507608051 100644 --- a/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb +++ b/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb @@ -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-no-comps/') 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) diff --git a/test/actions/pulp3/orchestration/copy_all_units_test.rb b/test/actions/pulp3/orchestration/copy_all_units_test.rb index ab13d06caa4..e916b98a6c8 100644 --- a/test/actions/pulp3/orchestration/copy_all_units_test.rb +++ b/test/actions/pulp3/orchestration/copy_all_units_test.rb @@ -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-no-comps/') @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-no-comps/') ensure_creatable(@repo, @primary) create_repo(@repo, @primary) @@ -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-no-comps/') sync_args = {:smart_proxy_id => @primary.id, :repo_id => @repo.id} ForemanTasks.sync_task(::Actions::Pulp3::Orchestration::Repository::Sync, @repo, @primary, sync_args) diff --git a/test/actions/pulp3/orchestration/export_test.rb b/test/actions/pulp3/orchestration/export_test.rb index 3e5c6ba5d1d..ff8176d86c1 100644 --- a/test/actions/pulp3/orchestration/export_test.rb +++ b/test/actions/pulp3/orchestration/export_test.rb @@ -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-no-comps/') @repo = create_and_sync(@repo, @primary) @content_view = @repo.content_view @content_view_version = @repo.content_view_version diff --git a/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb b/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb index 30cf588ddd5..23bb8502ee8 100644 --- a/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb +++ b/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb @@ -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-no-comps/') @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-no-comps/') ::Katello::Repository.any_instance.stubs(:soft_copy_of_library?).returns(false) diff --git a/test/actions/pulp3/orchestration/yum_sync_test.rb b/test/actions/pulp3/orchestration/yum_sync_test.rb index 3d3260ef2ad..8fc6f81aff7 100644 --- a/test/actions/pulp3/orchestration/yum_sync_test.rb +++ b/test/actions/pulp3/orchestration/yum_sync_test.rb @@ -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-no-comps/') create_repo(@repo, @primary) ForemanTasks.sync_task( ::Actions::Katello::Repository::MetadataGenerate, @repo) diff --git a/test/actions/pulp3/repository/repair_test.rb b/test/actions/pulp3/repository/repair_test.rb index e11654ae6bc..aa88e95ec68 100644 --- a/test/actions/pulp3/repository/repair_test.rb +++ b/test/actions/pulp3/repository/repair_test.rb @@ -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-no-comps/') create_repo(@repo, @primary) ForemanTasks.sync_task( ::Actions::Katello::Repository::MetadataGenerate, @repo) diff --git a/test/lib/tasks/pulpcore/repository_vcr_test.rb b/test/lib/tasks/pulpcore/repository_vcr_test.rb index ec5fb24ffdd..cfc12e2883c 100644 --- a/test/lib/tasks/pulpcore/repository_vcr_test.rb +++ b/test/lib/tasks/pulpcore/repository_vcr_test.rb @@ -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-no-comps/') @backend_service = ::Katello::Pulp3::Repository::Yum.new(@library_repo, @primary) ENV['COMMIT'] = nil diff --git a/test/services/katello/pulp3/rpm_test.rb b/test/services/katello/pulp3/rpm_test.rb index 7b781c66a40..b0a784c8321 100644 --- a/test/services/katello/pulp3/rpm_test.rb +++ b/test/services/katello/pulp3/rpm_test.rb @@ -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-no-comps/') ensure_creatable(@repo, @primary) create_repo(@repo, @primary) diff --git a/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json b/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json index b8868d039dd..5f489cdd020 100644 --- a/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json +++ b/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json @@ -46,7 +46,7 @@ "name": "Library" }, "content_type": "yum", - "url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/", + "url": "https://fixtures.pulpproject.org/rpm-no-comps/", "arch": "noarch", "content_id": "1597685535659", "auto_enabled": true, diff --git a/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/cvCompareRepositories.fixtures.json b/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/cvCompareRepositories.fixtures.json index d4a46dfe6dc..0e04a3e5166 100644 --- a/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/cvCompareRepositories.fixtures.json +++ b/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/cvCompareRepositories.fixtures.json @@ -149,7 +149,7 @@ "name": "Library" }, "content_type": "yum", - "url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/", + "url": "https://fixtures.pulpproject.org/rpm-no-comps/", "arch": "noarch", "os_versions": [], "content_id": "1664981648561",