Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] Extend rules/config.user to more Makefiles #7344

Merged
merged 1 commit into from
Apr 18, 2021

Conversation

bluecmd
Copy link
Contributor

@bluecmd bluecmd commented Apr 15, 2021

rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Why I did it

I want to set SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD which is read by Makefile.work.

How I did it

I extended the existing functionality introduced in #5325.

How to verify it

echo 'SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD = y` > rules/config.user
make [some target]
ps ax | grep 'docker.sock' --color
# Verify that the docker container running has  -v /var/run/docker.sock:/var/run/docker.sock set.

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

  • 201811
  • 201911
  • 202006
  • 202012

Description for the changelog

Extending functionality of rules/config.user to include all build options.

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

image

rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Signed-off-by: Christian Svensson <blue@cmd.nu>
@bluecmd
Copy link
Contributor Author

bluecmd commented Apr 16, 2021

@Staphylo: You did the initial addition of the config.user, what do you say about this addition?

@bluecmd
Copy link
Contributor Author

bluecmd commented Apr 16, 2021

Not sure why Azure.sonic-buildimage (Test kvmtest-t0) Failing after 53m — Test kvmtest-t0 failed is happening. Hints welcome! The issue looks unrelated, but I do not know how to rerun the tests if I even can.

@Staphylo
Copy link
Collaborator

That change looks good to me. I actually missed that include rules/config reference in Makefile.work so thanks for the fix!
It was indeed the intention to include the user config everywhere the base config is included.

Regarding the test runs, you'll have to wait for a project owner to restart the failed jobs.
I'm not sure if the job re-trigger knobs via comments are back with the azure pipelines.

@lguohan
Copy link
Collaborator

lguohan commented Apr 16, 2021

now there is command like "/azpw run" to re-run the job now.

@lguohan lguohan merged commit ea46039 into sonic-net:master Apr 18, 2021
@bluecmd bluecmd deleted the patch-1 branch April 19, 2021 13:06
yxieca added a commit that referenced this pull request Apr 29, 2021
yxieca added a commit that referenced this pull request Apr 30, 2021
Why I did it
After PR #7344, 'make init' and/or 'make reset' will also build sonic slave dockers.

'-include rules/config.user' is supposed to be fine when the file is missing. However, when the file is missing, it generates a delayed error which later causes make init and make reset trying to build the sonic slave dockers.

How I did it
Define a do-nothing target for config.user to catch config.user build therefore preventing other builds to be triggered unexpectedly.

How to verify it
did make init and it is now only doing submodule init.
daall pushed a commit that referenced this pull request May 10, 2021
rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Signed-off-by: Christian Svensson <blue@cmd.nu>
daall pushed a commit that referenced this pull request May 10, 2021
Why I did it
After PR #7344, 'make init' and/or 'make reset' will also build sonic slave dockers.

'-include rules/config.user' is supposed to be fine when the file is missing. However, when the file is missing, it generates a delayed error which later causes make init and make reset trying to build the sonic slave dockers.

How I did it
Define a do-nothing target for config.user to catch config.user build therefore preventing other builds to be triggered unexpectedly.

How to verify it
did make init and it is now only doing submodule init.
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Signed-off-by: Christian Svensson <blue@cmd.nu>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
Why I did it
After PR sonic-net#7344, 'make init' and/or 'make reset' will also build sonic slave dockers.

'-include rules/config.user' is supposed to be fine when the file is missing. However, when the file is missing, it generates a delayed error which later causes make init and make reset trying to build the sonic slave dockers.

How I did it
Define a do-nothing target for config.user to catch config.user build therefore preventing other builds to be triggered unexpectedly.

How to verify it
did make init and it is now only doing submodule init.
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Signed-off-by: Christian Svensson <blue@cmd.nu>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
Why I did it
After PR sonic-net#7344, 'make init' and/or 'make reset' will also build sonic slave dockers.

'-include rules/config.user' is supposed to be fine when the file is missing. However, when the file is missing, it generates a delayed error which later causes make init and make reset trying to build the sonic slave dockers.

How I did it
Define a do-nothing target for config.user to catch config.user build therefore preventing other builds to be triggered unexpectedly.

How to verify it
did make init and it is now only doing submodule init.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants