[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#249
Merged
mssonicbld merged 3 commits intoAzure:202305from Feb 6, 2024
Merged
Conversation
Collaborator
mssonicbld
commented
Feb 6, 2024
mssonicbld
commented
Why I did it
The PR introduced a bug for slim image build, #17905, by which the sonic_asic_platform is missing when build docker image for slim image.
[ building ] [ target/docker-dhcp-relay.gz ]
/sonic/dockers/docker-dhcp-relay/cli-plugin-tests /sonic
/sonic
Traceback (most recent call last):
File "/usr/local/bin/j2", line 8, in <module>
sys.exit(main())
File "/usr/local/lib/python3.9/dist-packages/j2cli/cli.py", line 202, in main
output = render_command(
File "/usr/local/lib/python3.9/dist-packages/j2cli/cli.py", line 186, in render_command
result = renderer.render(args.template, context)
File "/usr/local/lib/python3.9/dist-packages/j2cli/cli.py", line 85, in render
return self._env \
File "/usr/lib/python3/dist-packages/jinja2/environment.py", line 1090, in render
self.environment.handle_exception()
File "/usr/lib/python3/dist-packages/jinja2/environment.py", line 832, in handle_exception
reraise(*rewrite_traceback_stack(source=source))
File "/usr/lib/python3/dist-packages/jinja2/_compat.py", line 28, in reraise
raise value.with_traceback(tb)
File "/sonic/dockers/docker-dhcp-relay/Dockerfile.j2", line 48, in top-level template code
{% if build_reduce_image_size != "y" or sonic_asic_platform != "broadcom" %}
jinja2.exceptions.UndefinedError: 'sonic_asic_platform' is undefined
make: *** [slave.mk:1072: target/docker-dhcp-relay.gz] Error 1
make: *** Waiting for unfinished jobs....
[ finished ] [ target/docker-swss-layer-bullseye.gz ]
[ finished ] [ target/docker-syncd-brcm-dnx.gz ]
make[1]: *** [Makefile.work:608: target/sonic-broadcom.bin] Error 2
make[1]: Leaving directory '/data/work/1/s'
make: *** [Makefile:41: target/sonic-broadcom.bin] Error 2
And why it slipped the PR test? PR test doesn't compile with slim option, it won't check sonic_asic_platform != "broadcom" for PR build.
Work item tracking
Microsoft ADO (number only):
How I did it
Export sonic_asic_platform for docker build in slave.mk
How to verify it
build with slim image option.
… automatically (#18036) #### Why I did it src/sonic-platform-common ``` * a64276a - (HEAD -> 202305, origin/202305) Tx/Rx power values should be rounded up to 3 decimal places (Azure#432) (22 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
requested review from
lguohan,
qiluo-msft and
xumia
as code owners
r12f
pushed a commit
that referenced
this pull request
Dec 19, 2024
…lly (#19325) #### Why I did it src/sonic-gnmi ``` * a610784 - (HEAD -> master, origin/master, origin/HEAD) Improve timeout for GNMI dbus service (#265) (3 days ago) [ganglv] * b1c90c9 - Add unit test for vlan interface (#264) (6 days ago) [ganglv] * fbf0234 - Add unit test for syslog config (#263) (6 days ago) [ganglv] * 047fc29 - Add unit test for portchannel interface (#262) (6 days ago) [ganglv] * 52dd8e7 - Add unit test for pg headroom (#261) (6 days ago) [ganglv] * 8a10d9f - Add unit test for pfcwd status (#260) (6 days ago) [ganglv] * 65a43bc - Add unit test for pfcwd interval (#259) (6 days ago) [ganglv] * 0bbb9ef - Add unit test for ntp (#258) (7 days ago) [ganglv] * e5c43a4 - Add unit test for monitor config (#257) (7 days ago) [ganglv] * 8a8881e - Add unit test for mmu dynamic threshold (#256) (7 days ago) [ganglv] * 76857df - Add unit test for lo interface (#255) (7 days ago) [ganglv] * c35c69d - Add unit test for k8s config (#254) (8 days ago) [ganglv] * dd0bdcf - Add unit test for IPV6 (#253) (8 days ago) [ganglv] * 9a1133f - Add unit test for incremental qos (#252) (8 days ago) [ganglv] * 9bf7969 - Add unit test for eth interface (#251) (8 days ago) [ganglv] * 2e1eb05 - Add unit test for ECN config (#250) (8 days ago) [ganglv] * 56f17eb - Add unit test for dynamic ACL (#249) (8 days ago) [ganglv] * 388eba8 - Add unit test for DHCP relay (#245) (10 days ago) [ganglv] * fd2fdf6 - Add unit test for CACL (#243) (11 days ago) [ganglv] ``` #### How I did it #### How to verify it #### Description for the changelog
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
2 participants
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.