Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202606 - #3093

Merged
mssonicbld merged 7 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge
Sep 14, 2026
Merged

mssonicbld merged 7 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* ccd774c0f - (head/202605) [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#29457) (2026-09-10) [mssonicbld]
* e8e6baa41 - [submodule] Update submodule sonic-host-services to the latest HEAD automatically (#29415) (2026-09-10) [mssonicbld]<br>```

…utomatically (#29415)

#### Why I did it
src/sonic-host-services
```
* cd0f04a - (HEAD -> 202605, origin/202605) [202605] Backport caclmgrd dhcp_server syslog INPUT ownership (Azure#412) (Azure#426) (24 hours ago) [Xichen96]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…atically (#29457)

#### Why I did it
src/sonic-utilities
```
* ce150de6 - (HEAD -> 202605, origin/202605) Tolerate ENOENT in vlanintf_validator ip neigh flush (#4809) (22 hours ago) [Divyarajsinh Jhala]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

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

mssonicbld and others added 3 commits September 11, 2026 04:13
…D automatically (#29453)

#### Why I did it
src/sonic-platform-daemons
```
* 9594450 - (HEAD -> 202605, origin/202605) [Thermalctld] Add condtion before print error log for missing event.log on Non-BMC platform (Azure#893) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…tically (#29455)

#### Why I did it
src/sonic-sairedis
```
* a008d293 - (HEAD -> 202605, origin/202605) Manual cast new syncd arg logic from master to 202605 (Azure#2000) (Azure#2021) (28 hours ago) [Justin Wong]
* 239f273f - Auto-use enablePerPortCounterDiscovery syncd arg on Broadcom ASICs (Azure#2072) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld
mssonicbld force-pushed the sonicbld/202606-merge branch from cf57cbb to 02c8fa4 Compare September 12, 2026 03:03
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

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

@mssonicbld
mssonicbld force-pushed the sonicbld/202606-merge branch from 02c8fa4 to db46a81 Compare September 13, 2026 03:03
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

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

mssonicbld and others added 2 commits September 13, 2026 19:12
<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it
To add support for the new product SteamerLane (Arista_7060XE7_64PRS_MV3_L).

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Created device folder `x86_64-arista_7060xe7_64prs_mv3_l` and add all of the requested HWSKUs:
- Arista-7060XE7-64PRS-P128X4
- Arista-7060XE7-64PRS-P128X2
- Arista-7060XE7-64PRS-O128P64X4
- Arista-7060XE7-64PRS-V512X4

#### How to verify it
Load image onto a SteamerLane system and configure the desired HWSKU.

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.

If you request a backport/cherry-pick, provide both:
1. A GitHub issue or Microsoft ADO work item tracking the change.
2. Test evidence from the target branch(es) requested below.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511
- [ ] 202512
- [X] 202605 - target release branch for SteamerLane
- [ ] 202608

#### Tested branch

<!--
- Select each branch where the change was tested.
- If you request a backport/cherry-pick, select the base branch and the tested
 target release branch(es).
-->

- [X] master
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511
- [ ] 202512
- [X] 202605
- [ ] 202608
- [ ] N/A

#### Test result

Tested all HWSKU on an internal master image and `SONiC.20260500.03` image provided by MSFT. Confirmed `show version` had correct platform and HWSKU. Also confirmed `show interface status` had correct port breakout for all interfaces.

202605: SONiC.20260500.03 -
`Arista-7060XE7-64PRS-P128X4`:
```
SONiC Software Version: SONiC.20260500.03
SONiC OS Version: 13
Distribution: Debian 13.5
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: ae8f5dbf44
Build date: Wed Jul 29 23:05:51 UTC 2026
Built by: azureuser@f5d228bac000004

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-P128X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 20:15:53 up 2:16, 1 user, load average: 0.23, 0.19, 0.23
Date: Thu 30 Jul 2026 20:15:53
```

`Arista-7060XE7-64PRS-P128X4-lossless`:
```
SONiC Software Version: SONiC.20260500.03
SONiC OS Version: 13
Distribution: Debian 13.5
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: ae8f5dbf44
Build date: Wed Jul 29 23:05:51 UTC 2026
Built by: azureuser@f5d228bac000004

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-P128X4-lossless
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 20:21:10 up 2 min, 1 user, load average: 0.34, 0.27, 0.11
Date: Thu 30 Jul 2026 20:21:10
```

`Arista-7060XE7-64PRS-O128P64X4`:
```
SONiC Software Version: SONiC.20260500.03
SONiC OS Version: 13
Distribution: Debian 13.5
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: ae8f5dbf44
Build date: Wed Jul 29 23:05:51 UTC 2026
Built by: azureuser@f5d228bac000004

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-O128P64X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 20:58:56 up 1 min, 1 user, load average: 1.29, 0.42, 0.15
Date: Thu 30 Jul 2026 20:58:56
```

`Arista-7060XE7-64PRS-V512X4`:
```
SONiC Software Version: SONiC.20260500.03
SONiC OS Version: 13
Distribution: Debian 13.5
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: ae8f5dbf44
Build date: Wed Jul 29 23:05:51 UTC 2026
Built by: azureuser@f5d228bac000004

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-V512X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 23:32:32 up 24 min, 1 user, load average: 1.04, 0.89, 0.91
Date: Thu 30 Jul 2026 23:32:32
```

master: SONiC.branch.master-ars.db438aaf-buildimage.d4c15717c2a33b63b4b4f2ea1c32d8d34b1797fc-nightly-2026.07.29.08.06 -
`Arista-7060XE7-64PRS-P128X4`:
```
SONiC Software Version: SONiC.branch.master-ars.db438aaf-buildimage.d4c15717c2a33b63b4b4f2ea1c32d8d34b1797fc-nightly-2026.07.29.08.06
SONiC OS Version: 13
Distribution: Debian 13.6
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: d50b70edf
Build date: Wed Jul 29 12:07:41 UTC 2026
Built by: jenkins@jenkins-arsonic-k8s-arsonic-backend-k8s-90735-rsfq6-5mgc7

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-P128X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 00:21:39 up 13 min, 1 user, load average: 0.20, 0.35, 0.27
Date: Fri 31 Jul 2026 00:21:39
```

`Arista-7060XE7-64PRS-P128X4-lossless`:
```
SONiC Software Version: SONiC.branch.master-ars.db438aaf-buildimage.d4c15717c2a33b63b4b4f2ea1c32d8d34b1797fc-nightly-2026.07.29.08.06
SONiC OS Version: 13
Distribution: Debian 13.6
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: d50b70edf
Build date: Wed Jul 29 12:07:41 UTC 2026
Built by: jenkins@jenkins-arsonic-k8s-arsonic-backend-k8s-90735-rsfq6-5mgc7

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-P128X4-lossless
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 00:22:38 up 14 min, 1 user, load average: 0.44, 0.40, 0.29
Date: Fri 31 Jul 2026 00:22:38
```

`Arista-7060XE7-64PRS-O128P64X4`:
```
SONiC Software Version: SONiC.branch.master-ars.db438aaf-buildimage.d4c15717c2a33b63b4b4f2ea1c32d8d34b1797fc-nightly-2026.07.29.08.06
SONiC OS Version: 13
Distribution: Debian 13.6
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: d50b70edf
Build date: Wed Jul 29 12:07:41 UTC 2026
Built by: jenkins@jenkins-arsonic-k8s-arsonic-backend-k8s-90735-rsfq6-5mgc7

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-O128P64X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 00:32:26 up 5 min, 1 user, load average: 0.30, 0.28, 0.13
Date: Fri 31 Jul 2026 00:32:26
```

`Arista-7060XE7-64PRS-V512X4`:
```
$ show version

SONiC Software Version: SONiC.branch.master-ars.db438aaf-buildimage.d4c15717c2a33b63b4b4f2ea1c32d8d34b1797fc-nightly-2026.07.29.08.06
SONiC OS Version: 13
Distribution: Debian 13.6
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: d50b70edf
Build date: Wed Jul 29 12:07:41 UTC 2026
Built by: jenkins@jenkins-arsonic-k8s-arsonic-backend-k8s-90735-rsfq6-5mgc7

Platform: x86_64-arista_7060xe7_64prs_mv3_l
HwSKU: Arista-7060XE7-64PRS-V512X4
ASIC: broadcom
ASIC Count: 1
Serial Number: JAS26171012
Model Number: DCS-7060XE7-64PRS-MV3-L
Hardware Revision: 03.00
Uptime: 21:23:51 up 2:24, 1 user, load average: 0.86, 0.75, 0.89
Date: Wed 29 Jul 2026 21:23:51
```
<!--
- Provide the tested image version and test evidence for each selected branch.
- e.g.
- master: 20260716.01 - <test result or link>
- 202605: 20260531.42 - <test result or link>
-->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Add device folder for SteamerLane (Arista_7060XE7_64PRS_MV3_L) and all requested HWSKUs.

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld
mssonicbld force-pushed the sonicbld/202606-merge branch from db46a81 to e4861be Compare September 14, 2026 03:03
@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 1219776:

✅Stage Test:

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

@mssonicbld
mssonicbld merged commit 6900f85 into Azure:202606 Sep 14, 2026
25 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.

2 participants