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.

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

Adding Markers for FUSION HCI Provider Client Platform #8824

Merged
merged 9 commits into from
Nov 15, 2023

Conversation

suchita-g
Copy link
Contributor

No description provided.

@suchita-g suchita-g added the provider-client Provider-client solution label Nov 9, 2023
@suchita-g suchita-g self-assigned this Nov 9, 2023
@suchita-g suchita-g requested a review from a team as a code owner November 9, 2023 10:08
@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines label Nov 9, 2023
@pull-request-size pull-request-size bot added size/L PR that changes 100-499 lines and removed size/M PR that changes 30-99 lines labels Nov 9, 2023
Signed-off-by: suchita-g <[email protected]>

This will fix blocker issue for provider client run
red-hat-storage#8840
ocs_ci/framework/pytest_customization/marks.py Outdated Show resolved Hide resolved
ocs_ci/ocs/cluster.py Outdated Show resolved Hide resolved
skipif_hci_provider_and_client = pytest.mark.skipif(
config.ENV_DATA["platform"].lower() in HCI_PROVIDER_CLIENT_PLATFORMS
and config.is_hci_provider_exist()
and config.is_hci_client_exist(),
Copy link
Contributor

Choose a reason for hiding this comment

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

So the tests marked with this mark will not be skipped if run on hci provider without clients. Is it the desired behaviour? Wouldn't it be more useful to have a mark for skipping the test on any hci cluster, no matter if it's a provider, client or provider+client multicluster setup?

Copy link
Contributor Author

@suchita-g suchita-g Nov 14, 2023

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also as now platform type is unique to hci , we can do this in either way

ocs_ci/framework/__init__.py Outdated Show resolved Hide resolved
tests/hci_provider_client/test_hci_pc_markers.py Outdated Show resolved Hide resolved
Signed-off-by: suchita-g <[email protected]>
DanielOsypenko
DanielOsypenko previously approved these changes Nov 14, 2023
fbalak
fbalak previously approved these changes Nov 14, 2023
ebenahar
ebenahar previously approved these changes Nov 14, 2023
DanielOsypenko
DanielOsypenko previously approved these changes Nov 14, 2023
@suchita-g suchita-g dismissed stale reviews from DanielOsypenko and ebenahar via 070cae9 November 14, 2023 19:01
@openshift-ci openshift-ci bot removed the lgtm label Nov 14, 2023
@@ -13,6 +13,7 @@
import logging
from collections.abc import Mapping
from dataclasses import dataclass, field, fields
from ocs_ci.ocs.constants import HCI_CLIENT, HCI_PROVIDER
Copy link
Contributor Author

Choose a reason for hiding this comment

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

As use of from ocs_ci.ocs.constants import HCI_CLIENT, HCI_PROVIDER lib inside init.py file causes circular import Error. with Reference to other code in init.py file , using hci_client and provider as a hardcoded value.

[58](https://github.com/red-hat-storage/ocs-ci/actions/runs/6866895930/job/18674124645?pr=8824#step:6:61)
Tue, 14 Nov 2023 19:04:00 GMT
from ocs_ci.utility.utils import get_ocp_version
[59](https://github.com/red-hat-storage/ocs-ci/actions/runs/6866895930/job/18674124645?pr=8824#step:6:62)
Tue, 14 Nov 2023 19:04:00 GMT
ocs_ci/utility/utils.py:41: in <module>
[60](https://github.com/red-hat-storage/ocs-ci/actions/runs/6866895930/job/18674124645?pr=8824#step:6:63)
Tue, 14 Nov 2023 19:04:00 GMT
from ocs_ci.framework import config
[61](https://github.com/red-hat-storage/ocs-ci/actions/runs/6866895930/job/18674124645?pr=8824#step:6:64)
Tue, 14 Nov 2023 19:04:00 GMT
E ImportError: cannot import name 'config' from partially initialized module 'ocs_ci.framework' (most likely due to a circular import) (/home/runner/work/ocs-ci/ocs-ci/ocs_ci/framework/__init__.py)```

@suchita-g suchita-g added the Verified Mark when PR was verified and log provided label Nov 15, 2023
@openshift-ci openshift-ci bot added the lgtm label Nov 15, 2023
Copy link

openshift-ci bot commented Nov 15, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DanielOsypenko, ebenahar, fbalak, suchita-g

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ebenahar ebenahar merged commit c5b1de8 into red-hat-storage:master Nov 15, 2023
5 of 6 checks passed
@suchita-g suchita-g deleted the hci_pc_testmarker branch November 15, 2023 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm provider-client Provider-client solution size/L PR that changes 100-499 lines Verified Mark when PR was verified and log provided
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants