Skip to content

Commit 53c9344

Browse files
[4.20][Storage] In TestDataImportCronPvcSource use Fedora image from quay (RedHatQE#3850)
##### Short description: Cherry-pick RedHatQE#3810 into cnv-4.20 ##### More details: ##### What this PR does / why we need it: ##### Which issue(s) this PR fixes: ##### Special notes for reviewer: ##### jira-ticket: <!-- full-ticket-url needs to be provided. This would add a link to the pull request to the jira and close it when the pull request is merged If the task is not tracked by a Jira ticket, just write "NONE". -->
1 parent d3de22f commit 53c9344

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

tests/storage/data_import_cron/conftest.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
from ocp_resources.data_source import DataSource
77
from ocp_resources.resource import Resource
88

9+
from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE
910
from tests.storage.utils import create_role_binding
10-
from utilities.constants import BIND_IMMEDIATE_ANNOTATION, OS_FLAVOR_RHEL, TIMEOUT_10MIN, Images
11+
from utilities.constants import BIND_IMMEDIATE_ANNOTATION, OS_FLAVOR_FEDORA, REGISTRY_STR, TIMEOUT_10MIN, Images
1112
from utilities.infra import create_ns
1213
from utilities.storage import create_dv, data_volume_template_with_source_ref_dict
1314
from utilities.virt import VirtualMachineForTests, running_vm
@@ -21,12 +22,13 @@ def data_import_cron_pvc_target_namespace(admin_client, unprivileged_client):
2122

2223

2324
@pytest.fixture(scope="class")
24-
def dv_source_for_data_import_cron(namespace, storage_class_name_scope_module, rhel9_http_image_url):
25+
def dv_source_for_data_import_cron(namespace, storage_class_name_scope_module):
2526
with create_dv(
26-
dv_name="dv-source-rhel",
27+
dv_name="dv-source-fedora",
2728
namespace=namespace.name,
28-
url=rhel9_http_image_url,
29-
size=Images.Rhel.DEFAULT_DV_SIZE,
29+
source=REGISTRY_STR,
30+
url=QUAY_FEDORA_CONTAINER_IMAGE,
31+
size=Images.Fedora.DEFAULT_DV_SIZE,
3032
storage_class=storage_class_name_scope_module,
3133
) as dv:
3234
yield dv
@@ -40,14 +42,14 @@ def vm_for_data_source_import(
4042
name="vm-with-imported-data-source",
4143
namespace=data_import_cron_pvc_target_namespace.name,
4244
client=unprivileged_client,
43-
os_flavor=OS_FLAVOR_RHEL,
45+
os_flavor=OS_FLAVOR_FEDORA,
4446
data_volume_template=data_volume_template_with_source_ref_dict(
4547
data_source=DataSource(
4648
name=imported_data_source.name, namespace=data_import_cron_pvc_target_namespace.name
4749
),
4850
storage_class=storage_class_name_scope_module,
4951
),
50-
memory_guest=Images.Rhel.DEFAULT_MEMORY_SIZE,
52+
memory_guest=Images.Fedora.DEFAULT_MEMORY_SIZE,
5153
) as vm:
5254
running_vm(vm=vm)
5355
yield vm

0 commit comments

Comments
 (0)