Skip to content

[add-topo] Add support for specifying PTF docker image tag#1046

Merged
lguohan merged 1 commit intosonic-net:201811from
wangxin:ptf-imagetag-201811
Aug 2, 2019
Merged

[add-topo] Add support for specifying PTF docker image tag#1046
lguohan merged 1 commit intosonic-net:201811from
wangxin:ptf-imagetag-201811

Conversation

@wangxin
Copy link
Collaborator

@wangxin wangxin commented Aug 1, 2019

Signed-off-by: Xin Wang xinw@mellanox.com

Description of PR

Summary:
Fixes # (issue)

This is a sister PR of #1045
In PR#1045, an ansible variable ptf_imagetag is added. When deploy a toplogy, this variable can be used to specify the PTF image tag for creating PTF container. But in sonic-mgmt master branch, default value for the ptf_imagetag variable is set to "latest".

In this PR, default value for the ptf_imagetag is set to "201811". Because it is a good practice to use PTF and sonic-mgmt to test SONiC image from the same branch. So, it would be better to test 201811 SONiC build using PTF and sonic-mgmt from branch 201811 too.

If the PTF image built from 201811 was tagged with "201811" in docker registry, with this PR, then we do not need to explicitly specify PTF image tag in command line arguments of testbed-cli.sh when deploy a topology. By default PTF container will be created using PTF image with tag "201811":
./testbed-cli.sh add-topo - vault

This PR is 201811 branch specific. It should only go to the 201811 branch.

Type of change

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

Approach

How did you do it?

Add a ptf_imagetag ansible variable in add_topo.yml. Set its default value to "201811".

How did you verify/test it?

  • Add different tags for PTF image in docker registry
  • Checkout sonic-mgmt 201811 branch.
  • Run testbed-cli.sh add-topo without specifying ptf_imagetag, check the created PTF container on test server, PTF container is created using PTF image of "201811" tag.
  • Run testbed-cli.sh add-topo with "-e ptf_imagetag=myversion", check the created PTF container on test server, PTF container is created using PTF image of "myversion" tag (Assume PTF image tag "myversion" is added in registry).

Any platform specific information?

NA

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

NA

Documentation

Signed-off-by: Xin Wang <xinw@mellanox.com>
@lguohan lguohan merged commit d9ec5f8 into sonic-net:201811 Aug 2, 2019
@wangxin wangxin deleted the ptf-imagetag-201811 branch September 26, 2019 12:35
sdszhang pushed a commit to sdszhang/sonic-mgmt that referenced this pull request Mar 23, 2026
…onic-net#1046)

### Description of PR
Summary: Skip the everflow_dscp_with_policer test for the TH4 and TH5
Broadcom ASICs, as Policer is not supported for MIRROR_SESSION on those
ASICs.

Fixes # (issue)

### Type of change
- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [x] Skipped for non-supported platforms
- [ ] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [x] 202412
- [x] 202505

### Approach
#### What is the motivation for this PR?
Mirror policing is not supported on Broadcom TH4/TH5 ASICs, so
test_everflow_dscp_with_policer should be skipped accordingly.

#### How did you do it?
Added th4 and th5 to the list of unsupported ASICs for mirror policing.

#### How did you verify/test it?
Attempted to run the test and confirmed it is skipped.
Note: test log shows: "Skipping test since mirror policing is not
supported on broadcom th5 platforms"

#### Any platform specific information?
TH4/TH5-based platforms.

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
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