Skip to content

Commit

Permalink
Revert "test: fix upgrade dhcp6 on ec2 (#5131)" (#5148)
Browse files Browse the repository at this point in the history
This reverts commit 9758673.

Not needed after GH-5145.
  • Loading branch information
aciba90 committed Apr 8, 2024
1 parent 01027e5 commit 6d5978b
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions tests/integration_tests/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,6 @@ def test_clean_boot_of_upgraded_package(session_cloud: IntegrationCloud):
for values in post_network["network"]["ethernets"].values():
values.pop("dhcp6")
assert yaml.dump(pre_network) == yaml.dump(post_network)
elif PLATFORM == "ec2":
# After GH-3980, EC2 does not enable dhcp6 anymore. This block can
# be removed after the base cloud-init version is 24.1.
pre_network = yaml.load(pre_network, Loader=yaml.Loader)
post_network = yaml.load(post_network, Loader=yaml.Loader)
pre_network["network"]["ethernets"]["ens5"]["dhcp6"] = False
assert yaml.dump(pre_network) == yaml.dump(post_network)
else:
assert pre_network == post_network

Expand Down

0 comments on commit 6d5978b

Please sign in to comment.