Skip to content

Revert "[3.0] dhcp/dhclient.conf: add option rfc3442-classless-static…#8713

Merged
sindhu-karri merged 1 commit into3.0-devfrom
sindhu/revert_dhcp_client_conf_changes
Apr 8, 2024
Merged

Revert "[3.0] dhcp/dhclient.conf: add option rfc3442-classless-static…#8713
sindhu-karri merged 1 commit into3.0-devfrom
sindhu/revert_dhcp_client_conf_changes

Conversation

@sindhu-karri
Copy link
Copy Markdown
Contributor

@sindhu-karri sindhu-karri commented Apr 5, 2024

…-route in dhclient.conf (#8375)"

This reverts commit 98e3dcb.

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
The lisa testcase "validate_netvsc_reload" is failing due to dhcp changes in #8587
The testcase is passing once the above commit is reverted.

Test fails without fix: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=544973&view=logs&j=528a33a8-464e-565a-7855-df1244039b47
Test passes with fix: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=544809&view=logs&j=528a33a8-464e-565a-7855-df1244039b47

Note that the commit is already reverted in main (2.0) to fix the validate_netvsc_reload testcase.
#8587

Change Log
  • Revert option for classless static route configuration in dhclient.conf
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology

@sindhu-karri sindhu-karri requested a review from a team as a code owner April 5, 2024 11:50
@mfrw mfrw added the 3.0-dev PRs Destined for AzureLinux 3.0 label Apr 8, 2024
@sindhu-karri sindhu-karri merged commit f646411 into 3.0-dev Apr 8, 2024
@sindhu-karri sindhu-karri deleted the sindhu/revert_dhcp_client_conf_changes branch April 8, 2024 06:36
Xiaohong-Deng pushed a commit to Xiaohong-Deng/azurelinux that referenced this pull request Nov 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants