From d673bf4ad850e4cd89146d490e37ff83a369dc45 Mon Sep 17 00:00:00 2001 From: Sam Bible Date: Mon, 8 Apr 2024 10:52:08 -0500 Subject: [PATCH] change to non-sca org --- tests/foreman/api/test_contentview.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/foreman/api/test_contentview.py b/tests/foreman/api/test_contentview.py index 38cc3f38ed3..581ad6a3eb7 100644 --- a/tests/foreman/api/test_contentview.py +++ b/tests/foreman/api/test_contentview.py @@ -282,11 +282,15 @@ def test_positive_add_sha512_rpm(self, content_view, module_org, module_target_s @pytest.mark.tier2 def test_ccv_promote_registry_name_change( +<<<<<<< HEAD <<<<<<< HEAD self, module_target_sat, module_sca_manifest_org ======= self, module_target_sat, module_entitlement_manifest_org >>>>>>> 9c8e7f7a9 (CC Automation/Comp Eval coverage) +======= + self, module_target_sat, module_sca_manifest_org +>>>>>>> 2d1d7cb31 (change to non-sca org) ): """Testing CCV promotion scenarios where the registry_name has been changed to some specific value. @@ -311,11 +315,15 @@ def test_ccv_promote_registry_name_change( """ rh_repo_id = module_target_sat.api_factory.enable_rhrepo_and_fetchid( basearch=DEFAULT_ARCHITECTURE, +<<<<<<< HEAD <<<<<<< HEAD org_id=module_sca_manifest_org.id, ======= org_id=module_entitlement_manifest_org.id, >>>>>>> 9c8e7f7a9 (CC Automation/Comp Eval coverage) +======= + org_id=module_sca_manifest_org.id, +>>>>>>> 2d1d7cb31 (change to non-sca org) product=REPOS['kickstart']['rhel8_aps']['product'], repo=REPOS['kickstart']['rhel8_aps']['name'], reposet=REPOS['kickstart']['rhel8_aps']['reposet'], @@ -324,21 +332,29 @@ def test_ccv_promote_registry_name_change( repo = module_target_sat.api.Repository(id=rh_repo_id).read() repo.sync(timeout=600) cv = module_target_sat.api.ContentView( +<<<<<<< HEAD <<<<<<< HEAD organization=module_sca_manifest_org ======= organization=module_entitlement_manifest_org >>>>>>> 9c8e7f7a9 (CC Automation/Comp Eval coverage) +======= + organization=module_sca_manifest_org +>>>>>>> 2d1d7cb31 (change to non-sca org) ).create() cv = module_target_sat.api.ContentView(id=cv.id, repository=[repo]).update(["repository"]) cv.publish() cv = cv.read() composite_cv = module_target_sat.api.ContentView( +<<<<<<< HEAD <<<<<<< HEAD organization=module_sca_manifest_org, composite=True ======= organization=module_entitlement_manifest_org, composite=True >>>>>>> 9c8e7f7a9 (CC Automation/Comp Eval coverage) +======= + organization=module_sca_manifest_org, composite=True +>>>>>>> 2d1d7cb31 (change to non-sca org) ).create() composite_cv.component = [cv.version[0]] composite_cv = composite_cv.update(['component']) @@ -346,6 +362,7 @@ def test_ccv_promote_registry_name_change( composite_cv = composite_cv.read() # Create LCEs with the specific registry value lce1 = module_target_sat.api.LifecycleEnvironment( +<<<<<<< HEAD <<<<<<< HEAD organization=module_sca_manifest_org, registry_name_pattern='<%= repository.name %>', @@ -359,6 +376,13 @@ def test_ccv_promote_registry_name_change( lce2 = module_target_sat.api.LifecycleEnvironment( organization=module_entitlement_manifest_org, >>>>>>> 9c8e7f7a9 (CC Automation/Comp Eval coverage) +======= + organization=module_sca_manifest_org, + registry_name_pattern='<%= repository.name %>', + ).create() + lce2 = module_target_sat.api.LifecycleEnvironment( + organization=module_sca_manifest_org, +>>>>>>> 2d1d7cb31 (change to non-sca org) registry_name_pattern='<%= lifecycle_environment.label %>/<%= repository.name %>', ).create() version = composite_cv.version[0].read()