Skip to content

[202503] Upgrade network container to Trixie, fix netmiko error and use legacy container - #1422

Merged
bingwang-ms merged 3 commits into
Azure:202503from
sdszhang:backport/202503-testbed-preparation
Sep 18, 2026
Merged

bingwang-ms merged 3 commits into
Azure:202503from
sdszhang:backport/202503-testbed-preparation

Conversation

@sdszhang

@sdszhang Dashuai Zhang (sdszhang) commented Sep 18, 2026

Copy link
Copy Markdown

Description of PR

Summary:
Backport the following PRs into 202503 to pass PR test.

  1. sonic-net/sonic-mgmt PR 22682 - Upgrade network container to Trixie
  2. partially sonic-net/sonic-mgmt PR 16039 - Add support for Ubuntu 24.04 as the host and sonic-mgmt container
  3. Azure/sonic-mgmt.msft PR 910 - Fallback 202412 to use legacy docker-sonic-mgmt

Tracks ADO work item 39690984.

Type of change

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

Back port request

  • 202503

Approach

What is the motivation for this PR?

The PR test for 202503 failed during testbed provisioning because the 202503 sonic-mgmt branch requested the unavailable sonicdev-microsoft.azurecr.io:443/debian:jessie cEOS network-base image.

Validation also exposed two existing release compatibility gaps:

  • The newer Netmiko package moved NetMikoAuthenticationException.
  • docker-sonic-mgmt:latest now carries Ansible Core 2.20, whose generated modules require Python 3.8 or newer, while the release PTF image still uses Python 3.7.

This PR reuses previously accepted fixes rather than adding new branch-specific compatibility logic.

How did you do it?

Cherry-picked the three validated changes and adapted only the registry declaration to the existing msft 202503 configuration:

This PR Validated internal commit Original PR
d19da3cb46 8d2bf16cfc sonic-net/sonic-mgmt PR 22682 - Upgrade network container to Trixie
94eeee5311 de3e12b5e8 Partial backport of sonic-net/sonic-mgmt PR 16039 - Add support for Ubuntu 24.04 as the host and sonic-mgmt container
2fd58ca7e3 f934e787b3 Azure/sonic-mgmt.msft PR 910 - Fallback 202412 to use legacy docker-sonic-mgmt, retained by PR 1106 - Sync setup-container.sh from master

How did you verify/test it?

Run it manually on physical testbed.
https://elastictest.org/scheduler/testplan/6aab98f53bee13342e51a4b6

Any platform specific information?

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

N/A. This PR does not add a test case.

Documentation

N/A.

Backport sonic-net/sonic-mgmt#22682 (949419d), adapting the release branch directly from Jessie to Trixie. Keep the secret-backed SONiC registry configuration unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 7cd4d280-1419-43c2-b0cf-2fe14add3d3b
Signed-off-by: Dashuai Zhang <dashuaizhang@microsoft.com>
Signed-off-by: Dashuai Zhang <dashuaizhang@microsoft.com>
Cherry-picked-from: 61eac0d6a3b77f542fc40447c4aa9b0716d3f019
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Use the established internal-202412 release strategy so Elastictest runs this branch with the last known-good Ansible 2.13 management image. Keep the setup-container help text aligned with the pinned default.

Source-Commit: 632371a

Source-Followup: 20b2c91

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: f88dde06-9fa4-46b8-a88c-1485fa4eb2d1
@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:
1 pipeline(s) were filtered out due to trigger conditions.

@sdszhang Dashuai Zhang (sdszhang) changed the title [202503] Backport testbed preparation compatibility fixes [202503] Upgrade network container to Trixie, fix netmiko error and use legacy container Sep 18, 2026
@bingwang-ms
bingwang-ms merged commit c733fb2 into Azure:202503 Sep 18, 2026
4 checks passed
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