Upgrade macsec docker container from bookworm to trixie#26557
Open
yxieca wants to merge 2 commits intosonic-net:masterfrom
Open
Upgrade macsec docker container from bookworm to trixie#26557yxieca wants to merge 2 commits intosonic-net:masterfrom
yxieca wants to merge 2 commits intosonic-net:masterfrom
Conversation
Migrate the macsec docker container from Debian bookworm to trixie, aligning it with other containers already on trixie. Changes: - Update Dockerfile.j2 base image from swss-layer-bookworm to swss-layer-trixie - Update docker-macsec.mk references from BOOKWORM to TRIXIE Signed-off-by: Ying Xie <[email protected]>
The asyncsnmp test suite imports sonic_ax_impl which is not available in the build environment. On bookworm this was masked by dpkg cache hits; on trixie the cache miss triggers the test and fails. Disable with _TEST=n since these tests require the full SNMP agent runtime. Signed-off-by: Ying Xie <[email protected]>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
There was a problem hiding this comment.
Pull request overview
Upgrades the docker-macsec container to Debian trixie as part of the broader SONiC trixie migration, aligning both the Dockerfile base image and the build rules to trixie-specific swss layer inputs.
Changes:
- Switch
dockers/docker-macsec/Dockerfile.j2base image fromdocker-swss-layer-bookwormtodocker-swss-layer-trixie. - Update
rules/docker-macsec.mkto use trixie swss-layer dependencies and register the image underSONIC_TRIXIE_{,DBG_}DOCKERS. - Disable build-time tests for the
asyncsnmpPython wheel (rules/asyncsnmp-py3.mk).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
rules/docker-macsec.mk |
Points macsec docker build dependencies and environment scoping to trixie. |
rules/asyncsnmp-py3.mk |
Skips asyncsnmp wheel tests during the wheel build step. |
dockers/docker-macsec/Dockerfile.j2 |
Builds macsec image on top of the trixie swss-layer base image. |
| # Depends on sonic-platform-common so it is possible to import sonic_psu | ||
| $(ASYNCSNMP_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) | ||
| $(ASYNCSNMP_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) | ||
| $(ASYNCSNMP_PY3)_TEST = n |
There was a problem hiding this comment.
$(ASYNCSNMP_PY3)_TEST = n disables asyncsnmp wheel tests for all build environments, which reduces coverage and may hide regressions (especially since bookworm/trixie wheel builds run pytest when tests are enabled). If tests are being disabled due to a known failure, consider gating this to the affected BLDENV(s) (e.g., only trixie) and/or add an in-file rationale with a tracking issue/TODO to re-enable once fixed.
Suggested change
| $(ASYNCSNMP_PY3)_TEST = n | |
| # Keep wheel tests enabled to preserve coverage across supported build environments. | |
| $(ASYNCSNMP_PY3)_TEST = y |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Upgrade docker-macsec container from Debian bookworm to trixie as part of the SONiC trixie migration tracked in sonic-net/SONiC#2169.
Changes
dockers/docker-macsec/Dockerfile.j2: Change base image from bookworm to trixie (docker-swss-layer-trixie)rules/docker-macsec.mk: Update all BOOKWORM references to TRIXIErules/asyncsnmp-py3.mk: Disable asyncsnmp wheel tests during buildDependencies
Testing