From 46adc4988f253cf0468793d10e01e614f735158a Mon Sep 17 00:00:00 2001 From: Alberto Contreras Date: Tue, 2 Apr 2024 13:36:50 +0200 Subject: [PATCH] test: fix upgrade dhcp6 on ec2 After [0, 1], dhcp6 is going to be always false after upgrading cloud-init. Correct this in the integration test. Refs: [0] https://github.com/canonical/cloud-init/issues/3980 [1] https://bugs.launchpad.net/cloud-init/+bug/1976526 --- tests/integration_tests/test_upgrade.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py index e0d5b3219e5..343ea98a566 100644 --- a/tests/integration_tests/test_upgrade.py +++ b/tests/integration_tests/test_upgrade.py @@ -153,6 +153,13 @@ 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