Skip to content

[action] [PR:24755] Fix skip condition for testQosSaiBufferPoolWatermark on DNX#24827

Merged
mssonicbld merged 1 commit into
sonic-net:202511from
mssonicbld:cherry/202511/24755
May 28, 2026
Merged

[action] [PR:24755] Fix skip condition for testQosSaiBufferPoolWatermark on DNX#24827
mssonicbld merged 1 commit into
sonic-net:202511from
mssonicbld:cherry/202511/24755

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator

T2 Topos were recently added to constants['QOS_SAI_TOPO'] so the skip condition was not working as expected. This change replaces the current platform skip condition with a more strict asic based skip condition.

This test is invalid on DNX platforms as they do not support sai_thrift_read_buffer_pool_watermark.

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
  • Skipped for non-supported platforms
  • Test case improvement

Back port request

Approach

What is the motivation for this PR?

T2 Topos were recently added to constants['QOS_SAI_TOPO'] so the skip condition was not working as expected. This change replaces the current platform skip condition with a more strict asic based skip condition.

This test is invalid on DNX platforms as they do not support sai_thrift_read_buffer_pool_watermark.

How did you do it?

Changed the "platform in [" condition to "asic_subtype in" condition.

How did you verify/test it?

Ran on a DNX SKU to see the test is skipping.

Any platform specific information?

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

Documentation

…t#24755)

What: Updates the skip condition for `qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark` in tests/common/plugins/conditional_mark/tests_mark_conditions.yaml from a hard-coded platform list to `asic_subtype in ['broadcom-dnx']`.
Why: T2 topologies were recently added to `constants['QOS_SAI_TOPO']`, which broke the previous platform-based skip; the test is invalid on DNX platforms since they do not support `sai_thrift_read_buffer_pool_watermark`.
How: Replaced the `platform in [...]` condition with an `asic_subtype in ['broadcom-dnx']` condition while leaving the other skip clauses intact.
Testing: Ran on a DNX SKU and confirmed the test is correctly skipped. Azure Pipelines CI green; approved by abdosi and vmittal-msft.

Signed-off-by: Peter <peterbailey@arista.com>
Signed-off-by: mssonicbld <sonicbld@microsoft.com>
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Original PR: #24755

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

This cherry pick PR has been opened for more than 3 days. The mssonicbld will attempt to retry.

---Powered by SONiC BuildBot

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azpw retry

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Retrying failed(or canceled) jobs...

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Retrying failed(or canceled) stages in build 1120665:

✅Stage Test:

  • Job impacted-area-kvmtest-t2 by Elastictest: retried.
  • Job impacted-area-kvmtest-t1-lag by Elastictest: retried.
  • Job impacted-area-kvmtest-t0 by Elastictest: retried.

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

@vmittal-msft The cherry pick PR didn't pass PR checker after retry. Left a comment in original PR #24755 to notify author.

---Powered by SONiC BuildBot

@yijingyan2

Copy link
Copy Markdown

/azpw retry

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Retrying failed(or canceled) jobs...

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Retrying failed(or canceled) stages in build 1120665:

✅Stage Test:

  • Job impacted-area-kvmtest-t0 by Elastictest: retried.

@mssonicbld mssonicbld merged commit cb1496f into sonic-net:202511 May 28, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants