Skip to content

Override PTF_IMAGE_TAG for release branch [202411]#22585

Merged
kperumalbfn merged 1 commit intosonic-net:202411from
opcoder0:fix-pipeline-202411
May 14, 2025
Merged

Override PTF_IMAGE_TAG for release branch [202411]#22585
kperumalbfn merged 1 commit intosonic-net:202411from
opcoder0:fix-pipeline-202411

Conversation

@opcoder0
Copy link
Contributor

@opcoder0 opcoder0 commented May 9, 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

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 9, 2025 06:25
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
MGMT_BRANCH: $(BUILD_BRANCH)
PTF_IMAGE_TAG: $(BUILD_BRANCH)
Copy link
Contributor

Choose a reason for hiding this comment

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

@opcoder0 Do we need additional change in sonic-mgmt to use branch tag?

Copy link
Contributor Author

@opcoder0 opcoder0 May 13, 2025

Choose a reason for hiding this comment

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

@kperumalbfn changes to sonic-mgmt to use the branch based tag are already done for example here. The pipelines in buildimage and sonic-mgmt repo all use the pipeline on master branch which accepts parameter to override PTF_IMAGE_TAG. Each release branch now overrides the tag. It wasn't required before as all branches used mixed image. Now master uses py3 only image and hence the override.

Copy link
Contributor

Choose a reason for hiding this comment

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

@opcoder0 could you update this in master and that will be used for future releases as well.

@opcoder0 opcoder0 requested a review from kperumalbfn May 13, 2025 01:16
@kperumalbfn kperumalbfn merged commit e87edda into sonic-net:202411 May 14, 2025
19 checks passed
dgsudharsan pushed a commit to dgsudharsan/sonic-buildimage that referenced this pull request Jun 18, 2025
…-net#1159)

Code sync sonic-net/sonic-buildimage:202411 => 202412

```
*   8cd8a28 (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250610:2321 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\
| * 81dd34b (base/202411) mssonicbld 250608:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22883)
| * 66690b6 mssonicbld 250606:1001 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22857)
| * 221fdba mssonicbld 250606:1001 - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (sonic-net#22858)
| * 928671d mssonicbld 250603:1001 - switch to use host syslog to for openbmp logging (sonic-net#22817)
| * f212bcd mssonicbld 250531:1303 - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (sonic-net#22744)
| * e060bb6 mssonicbld 250529:1009 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (sonic-net#22740)
| * 6cfffb6 mssonicbld 250525:2201 - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (sonic-net#22290)
| * c4fef0a mssonicbld 250525:1903 - skip frr_bmp container from monit (sonic-net#22603)
| * 3a9d5bc Liu Shilong 250525:1239 - [build] Upgrade natsort pypi package from 6.2.1 to 8.4.0 (sonic-net#22609)
| * 683b336 mssonicbld 250523:1602 - Bump up /dev/shm size for Broadcom platforms to 512MB by default (sonic-net#22547)
| * fb14505 mssonicbld 250523:0323 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22636)
| * 78d363b mssonicbld 250515:1601 - [resolv-config] Improve container resolv.conf update mechanism (sonic-net#22462)
| * e87edda Sai Kiran 250514:1417 - Override PTF_IMAGE_TAG for release branch [202411] (sonic-net#22585)
```
vmittal-msft pushed a commit to vmittal-msft/sonic-buildimage that referenced this pull request Oct 20, 2025
…03 (sonic-net#1235)

```<br>* aa74696 - (HEAD -> 202503) Merge branch '202412' of https://github.com/Azure/sonic-buildimage-msft into 202503 (2025-06-13) [Sonic Automation]
* 9fa6edd - (origin/202412, 202412) [action] [PR:22588] skip frr_bmp container from monit (sonic-net#1212) (2025-06-12) [mssonicbld]
* 70de857 - [submodule][202412] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#1214) (2025-06-12) [mssonicbld]
* f3d9c03 - [action] [PR:22673] Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (sonic-net#1224) (2025-06-12) [mssonicbld]
* c20f188 - Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (sonic-net#1220) (2025-06-12) [rick-arista]
* 07dbeed - [FRR]: Fix SRv6 static SIDs delete crash (sonic-net#1200) (2025-06-12) [Riff]
|\ 
| failure_prs.log skip_prs.log 2d5e52b - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-10) [Carmine Scarpitta]
| failure_prs.log skip_prs.log 26e0868 - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-05) [Carmine Scarpitta]
| failure_prs.log skip_prs.log 1b90ab9 - Address review comments (2025-06-05) [Carmine Scarpitta]
| failure_prs.log skip_prs.log cb402c7 - [FRR]: Fix SRv6 static SIDs delete crash (2025-06-04) [Carmine Scarpitta]
* 053f8ac - [202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 (sonic-net#1159) (2025-06-12) [Riff]
|\ 
| failure_prs.log skip_prs.log 8cd8a28 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (2025-06-10) [r12f]
| failure_prs.log skip_prs.log 81dd34b - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22883) (2025-06-08) [mssonicbld]
| failure_prs.log skip_prs.log 66690b6 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22857) (2025-06-06) [mssonicbld]
| failure_prs.log skip_prs.log 221fdba - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (sonic-net#22858) (2025-06-06) [mssonicbld]
| failure_prs.log skip_prs.log 928671d - switch to use host syslog to for openbmp logging (sonic-net#22817) (2025-06-03) [mssonicbld]
| failure_prs.log skip_prs.log f212bcd - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (sonic-net#22744) (2025-05-31) [mssonicbld]
| failure_prs.log skip_prs.log e060bb6 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (sonic-net#22740) (2025-05-29) [mssonicbld]
| failure_prs.log skip_prs.log 6cfffb6 - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (sonic-net#22290) (2025-05-25) [mssonicbld]
| failure_prs.log skip_prs.log c4fef0a - skip frr_bmp container from monit (sonic-net#22603) (2025-05-25) [mssonicbld]
| failure_prs.log skip_prs.log 3a9d5bc - [build] Upgrade natsort pypi package from 6.2.1 to 8.4.0 (sonic-net#22609) (2025-05-24) [Liu Shilong]
| failure_prs.log skip_prs.log 683b336 - Bump up /dev/shm size for Broadcom platforms to 512MB by default (sonic-net#22547) (2025-05-23) [mssonicbld]
| failure_prs.log skip_prs.log fb14505 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22636) (2025-05-22) [mssonicbld]
| failure_prs.log skip_prs.log 78d363b - [resolv-config] Improve container resolv.conf update mechanism (sonic-net#22462) (2025-05-15) [mssonicbld]
| failure_prs.log skip_prs.log e87edda - Override PTF_IMAGE_TAG for release branch [202411] (sonic-net#22585) (2025-05-13) [Sai Kiran]
* 8081aec - Fix info and order of components for 7060x6_64pe_b (sonic-net#1231) (2025-06-12) [Ryan Garofano]<br>```
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.

3 participants