Skip to content

[202503] Sync merged F2 DHCP source fixes - #3073

Open
Xichen96 wants to merge 1 commit into
202503from
dev/xichenlin/202503-f2-dhcp-sync-1828720a
Open

Xichen96 wants to merge 1 commit into
202503from
dev/xichenlin/202503-f2-dhcp-sync-1828720a

Conversation

@Xichen96

@Xichen96 Xichen96 commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Why I did it

Deliver the three merged Fungible F2 DHCP fixes from public 202411 into Microsoft SONiC 202503: physical-member DHCPv6 relay ingress, VLAN-backed PortChannel monitor attribution, and prevention of pre-VLAN false relay-disparity alerts.

This is a manual, submodule-only sync attempt. All source changes have already merged:

Work item tracking
  • Microsoft ADO (number only): 39579805

How I did it

Update exactly two gitlinks on 202503:

Path Previous commit Final merged commit
src/dhcprelay 13d7f5aafea8418512c3258807ab9e920bc0e40f be8671589c4eccca384de06ed28196dc5b94fd78
src/dhcpmon 2519a88abd7f244d48026e8fee31ff1e7a1feb5c ee138055e160cdfc99b3aa8b4bb2a72b97ff3991

The new dhcpmon commit includes both source PRs. No other file, .gitmodules declaration, package metadata, dependency, CLI/service configuration, counter schema, or event contract is changed here.

How to verify it

  • Verify the diff contains only these two mode-160000 gitlinks and references the final merged source commits.
  • Prior combined-candidate hardware evidence is available in the source validation comment. All nine targeted checks passed: direct/bonded/fallback DORA attribution (3), bare-member visibility (1), pre-VLAN false-alert suppression (1), request/reply fault detection (2), and healthy/restart controls (2).
  • Both final merged component trees are identical to the tested trees. The buildimage base is also the same 061711f362345c4715fec5c2a480530da4c24b39; only the gitlink commit identities differ from that candidate.
  • This PR's image build, verification of the final merged pins in its artifact, and final delivery validation are still pending. The prior result is not a new PR-image or full KVM-suite pass.

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

None requested. This PR directly targets Microsoft 202503.

Tested branch (Please provide the tested image version)

  • Prior 202503 candidate: validate-f2-dhcp-202503-rx-dedupe-1828720a.1214622-5d1a77a10, with identical component source trees; see the linked evidence and its limitations.
  • New image built from this PR with the final merged gitlink commits.

Description for the changelog

Sync merged F2 DHCP relay and monitor fixes into Microsoft SONiC 202503.

Link to config_db schema for YANG module changes

Not applicable; this PR updates gitlinks only.

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

Not included.

Update only the DHCP relay and monitor gitlinks to the final merged 202411 source commits for the Fungible F2 delivery.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c23940f6-b749-4479-84f2-c094d432a4e0
Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
@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

/azp run

@azure-pipelines

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

yijingyan2 pushed a commit to Azure/sonic-mgmt.msft that referenced this pull request Sep 10, 2026
## Summary
- use `uv` for the Elastictest trigger that runs on `sonic-ubuntu-1c`
- move the three Pre-test jobs to clean Microsoft-hosted `ubuntu-latest`
agents

## Why
The self-hosted `sonic-ubuntu-1c` agents no longer provide `pip`,
causing every Elastictest trigger in Azure/sonic-buildimage-msft#3073 to
fail. Their persistent workspaces can also contain root-owned pytest
artifacts, causing checkout cleanup failures.

This backports the relevant approach from sonic-net/sonic-mgmt#25721 to
the 202412 pipeline.

---------

Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@yijingyan2

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

Lun Yue (lunyue-ms) added a commit to Azure/sonic-mgmt.msft that referenced this pull request Sep 11, 2026
### Description of PR

Backport sonic-net/sonic-mgmt#19258 to update legacy Ansible module
shebangs from `#!/usr/bin/env python` to `#!/usr/bin/python`.

Recent Elastictest runs for Azure/sonic-buildimage-msft#3073 use
`ansible-core 2.20.9` and fail during `Read duts minigraph` because
Ansible executes `/usr/bin/env python` literally, while the current
sonic-mgmt container has no `python` alias. The supported
`/usr/bin/python` shebang allows Ansible interpreter discovery to select
the available Python 3 interpreter.

`testbed_vm_info.py` already had the corrected shebang on this branch,
so this backport updates the remaining 23 modules.

### Type of change

- [x] Bug fix
- [ ] Testbed and Framework (new/improvement)
- [ ] New test case
- [ ] Test case improvement

### Back port request

- [x] 202503

### Validation

- Reproduced the Elastictest failure with `ansible-core 2.20.9` and an
`#!/usr/bin/env python` custom module.
- Confirmed that changing the shebang to `#!/usr/bin/python` enables
interpreter discovery and succeeds with the available Python 3
interpreter.
- Confirmed the PR contains only the upstream shebang changes.

Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Co-authored-by: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
@lunyue-ms

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@azure-pipelines

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

@sdszhang

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

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.

5 participants