-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
[eventd]Disabling eventd unit tests #17053
Conversation
@StormLiangMS Please cherry-pick this to 202305 |
@@ -29,7 +29,7 @@ endif | |||
-include rsyslog_plugin/subdir.mk | |||
-include rsyslog_plugin_tests/subdir.mk | |||
|
|||
all: sonic-eventd eventd-tests eventd-tool rsyslog-plugin rsyslog-plugin-tests | |||
all: sonic-eventd eventd-tool rsyslog-plugin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that a mistake to disable rsyslog-plugin-tests? @dgsudharsan
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @StormLiangMS We have build failures when compiling sonic-eventd target and I disabled all unit tests under this target.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically, there is no issue with rsyslog-plugin tests only with eventd-tests. My plan is to revert this PR once I can prove that there is no flakiness with tests with my fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zbud-msft pls let me know when your fix is ready.
Disabling eventd unit tests until sonic-net#16996 is addressed
Cherry-pick PR to 202305: #17061 |
…sonic-buildimage into internal 1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`: ``` <<<<<<< HEAD RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev ======= {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} >>>>>>> 274d320 ``` Accepted both changes, after resolved: ``` RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} ``` 2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled. So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit: ![image (2).png](https://dev.azure.com/msazure/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/8721f84d-7905-4f85-b5f1-0e19e8eac66b/pullRequests/9025464/attachments/image%20%282%29.png) Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068
Disabling eventd unit tests until sonic-net#16996 is addressed
Why I did it
Disabling eventd unit tests until #16996 is addressed
Work item tracking
How I did it
Removed the UT from compilation target
How to verify it
Building with changes
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)