Skip to content

Override PTF_IMAGE_TAG use release tag [202405]#22575

Merged
bingwang-ms merged 1 commit intosonic-net:202405from
opcoder0:fix-pipeline-202405
May 9, 2025
Merged

Override PTF_IMAGE_TAG use release tag [202405]#22575
bingwang-ms merged 1 commit intosonic-net:202405from
opcoder0:fix-pipeline-202405

Conversation

@opcoder0
Copy link
Contributor

@opcoder0 opcoder0 commented May 8, 2025

Why I did it

The azure pipeline uses sonic-mgmt master branch to invoke tests. The default value of PTF_IMAGE_TAG on master branch is "latest" which is a Python 3 only image. For release branches we use mixed image which is tagged under branch specific tag name. This PR overrides it here.

Work item tracking
  • Microsoft ADO (number only):

How I did it

Override PTF_IMAGE_TAG in pipeline

How to verify it

TBD

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

NA

Description for the changelog

Override PTF_IMAGE_TAG for release branch PR tests

The azure pipeline uses sonic-mgmt master branch to invoke tests. The default value of PTF_IMAGE_TAG on master branch is "latest" which is a Python 3 only image. For release branches we use mixed image which is tagged under branch specific tag name.

Link to config_db schema for YANG module changes

NA

A picture of a cute animal (not mandatory but encouraged)

NA

@opcoder0 opcoder0 requested a review from lguohan as a code owner May 8, 2025 09:50
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@opcoder0 opcoder0 requested review from lerry-lee and wangxin May 8, 2025 09:50
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@xwjiang-ms xwjiang-ms May 8, 2025

Choose a reason for hiding this comment

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

how about using $(BUILD_BRANCH) and cherry-pick?

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor

@opcoder0 Can you address the conflict in 202305 and 202311 branch? Seems the PR test in these two branches is also impacted.

@opcoder0
Copy link
Contributor Author

opcoder0 commented May 9, 2025

@opcoder0 Can you address the conflict in 202305 and 202311 branch? Seems the PR test in these two branches is also impacted.

Hi @bingwang-ms Sure. I have added the approved labels. I am waiting for the PRs to be created so I can fix the conflicts.

@bingwang-ms
Copy link
Contributor

@opcoder0 Can you address the conflict in 202305 and 202311 branch? Seems the PR test in these two branches is also impacted.

Hi @bingwang-ms Sure. I have added the approved labels. I am waiting for the PRs to be created so I can fix the conflicts.

Adding the Approve tag won't help in this case. Automation can't create PR because of the conflict. Can you file direct PR to 202311/202405/202411 branches?

@opcoder0 opcoder0 changed the title Override PTF_IMAGE_TAG use release tag Override PTF_IMAGE_TAG use release tag [202405] May 9, 2025
@opcoder0 opcoder0 requested a review from bingwang-ms May 9, 2025 06:27
@bingwang-ms bingwang-ms merged commit 654ae55 into sonic-net:202405 May 9, 2025
18 checks passed
patrickmacarthur pushed a commit to patrickmacarthur/sonic-buildimage that referenced this pull request Aug 6, 2025
…05 (sonic-net#1108)

```<br>* 32312e8 - (HEAD -> 202405) Merge branch '202405' of https://github.com/sonic-net/sonic-buildimage into 202405 (2025-05-10) [Sonic Automation]
* 654ae55 - (head/202405) Fix commit - remove submodules (sonic-net#22575) (2025-05-09) [Sai Kiran]<br>```
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.

5 participants