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

[dhcp_relay] Upgrade dhcp_relay container to bookworm #17783

Merged
merged 18 commits into from
Mar 21, 2024

Conversation

yaqiangz
Copy link
Contributor

@yaqiangz yaqiangz commented Jan 15, 2024

Why I did it

Upgrade dhcp_relay container to bookworm

Work item tracking
  • Microsoft ADO (number only): 26699855

How I did it

  1. Upgrade dhcp_relay container to bookworm
  2. Because isc-dhcp-relay_4.4.1 is not supported in bookworm due to dependency lib libbind-export-dev missing in bookworm:
    2.1 Update isc-dhcp-relay from 4.4.1-2.3+deb11u2 to 4.4.3-P1-4
    2.2 Make the patch applicable to the new version of the isc-dhcp-relay. Most of patch conflicts are generated by line number incorrect. And issue fixed by patch13 was fixed in isc-dhcp-relay-4.4.3, hence remove this patch.
  3. Install libjsoncpp-dev in slave container to support dhcp6relay build.

How to verify it

Install image and run dhcp_relay related tests in MLNX-2700-T0 and Arista-720DT-M0 and 7260-DUALTOR. All passed.

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

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)

@yaqiangz yaqiangz force-pushed the master_dhcp_relay_bookworm branch from cdd1ced to cea0aa1 Compare January 17, 2024 01:17
@yaqiangz
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yaqiangz yaqiangz force-pushed the master_dhcp_relay_bookworm branch 7 times, most recently from e075565 to 55ae94e Compare January 17, 2024 15:18
@yaqiangz yaqiangz force-pushed the master_dhcp_relay_bookworm branch from 55ae94e to 07c26c2 Compare January 18, 2024 06:37
@yaqiangz yaqiangz force-pushed the master_dhcp_relay_bookworm branch from 5424b44 to 6df14e0 Compare January 29, 2024 10:25
@yaqiangz yaqiangz force-pushed the master_dhcp_relay_bookworm branch from d2c4fc0 to c32c03e Compare January 30, 2024 04:13
@yaqiangz yaqiangz changed the title [test] Just want to build [dhcp_relay] Upgrade dhcp_relay container to bullseye Feb 7, 2024
@yaqiangz
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yaqiangz
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yaqiangz yaqiangz marked this pull request as ready for review March 19, 2024 10:09
@yaqiangz yaqiangz changed the title [dhcp_relay] Upgrade dhcp_relay container to bullseye [dhcp_relay] Upgrade dhcp_relay container to bookworm Mar 20, 2024
@yaqiangz
Copy link
Contributor Author

@yxieca Could you please help to merge this PR?

@yxieca yxieca merged commit b3845b6 into sonic-net:master Mar 21, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants