Fix the compile issue for slim image #18015
Merged
Conversation
This file contains 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
StormLiangMS
requested review from
qiluo-msft,
xumia and
lguohan
as code owners
xumia
approved these changes
Feb 3, 2024
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Feb 4, 2024
Why I did it The PR introduced a bug for slim image build, sonic-net#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.
|
Cherry-pick PR to 202305: #18028 |
mssonicbld
pushed a commit
that referenced
this pull request
Feb 5, 2024
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.
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Feb 7, 2024
Why I did it The PR introduced a bug for slim image build, sonic-net#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.
|
Cherry-pick PR to 202311: #18057 |
yxieca
pushed a commit
that referenced
this pull request
Feb 7, 2024
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. Co-authored-by: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
yxieca
added
Included in 202311 Branch
and removed
Approved for 202311 Branch
Created PR to 202311 Branch
labels
sonic-otn
pushed a commit
to Weitang-Zheng/sonic-buildimage
that referenced
this pull request
Mar 11, 2024
Why I did it The PR introduced a bug for slim image build, sonic-net#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.
saksarav-nokia
pushed a commit
to saksarav-nokia/sonic-buildimage
that referenced
this pull request
Mar 12, 2024
Why I did it The PR introduced a bug for slim image build, sonic-net#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.
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.
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.
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
How I did it
Export sonic_asic_platform for docker build in slave.mk
How to verify it
build with slim image option.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)