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

Add support for skipping tests on the smartswitch DPU #15699

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

congh-nvidia
Copy link
Contributor

Description of PR

Summary:
This PR is to add the support for skipping tests on the smartswitch DPU.
With the change in PR(#15695), we are able to run a test directly on a smartswitch DPU. But we need to also be able to skip tests on a DPU based on the conditional marks.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

Add support for skipping tests on the smartswitch DPU

How did you do it?

There are 2 main changes in this PR:

  1. When getting the basic facts of the DUT in the conditional mark plugin, use the dut name in the --host-pattern parameter instead of the first dut defined in the testbed file. By this change, we will be able to get the dpu facts when running the test only on the dpu.
  2. Update the cache logic to save the cache with the dut name. So that in a same regression run, we are able to save and get cache for both the switch and the dpu.

How did you verify/test it?

Run regression in our internal regression. It works fine.

Any platform specific information?

This change is only for the smartswitch testbed, and it will not harm the regular testbeds.

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/common/plugins/conditional_mark/init.py:160:1: E302 expected 2 blank lines, found 1
tests/common/plugins/conditional_mark/init.py:163:20: F821 undefined name 'tbinfo'
tests/common/plugins/conditional_mark/init.py:168:1: E302 expected 2 blank lines, found 1
tests/common/plugins/conditional_mark/init.py:176:1: E302 expected 2 blank lines, found 1

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/common/plugins/conditional_mark/init.py:160:1: E302 expected 2 blank lines, found 1
tests/common/plugins/conditional_mark/init.py:171:1: E302 expected 2 blank lines, found 1
tests/common/plugins/conditional_mark/init.py:179:1: E302 expected 2 blank lines, found 1

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants