From 16a76ccd38416e8840c4939eb46989d7ab69de2f Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Wed, 16 Aug 2023 13:31:59 -0500 Subject: [PATCH] bases: bump compatibility tag Signed-off-by: Callahan Kovacs --- craft_providers/base.py | 2 +- tests/integration/lxd/test_launcher.py | 10 +++++----- tests/integration/multipass/test_launch.py | 6 +++--- tests/unit/actions/test_snap_installer.py | 2 +- tests/unit/bases/test_almalinux.py | 20 +++++++++---------- tests/unit/bases/test_centos_7.py | 20 +++++++++---------- tests/unit/bases/test_instance_config.py | 8 ++++---- tests/unit/bases/test_ubuntu_buildd.py | 20 +++++++++---------- tests/unit/lxd/test_launcher.py | 10 +++++----- tests/unit/lxd/test_lxd_provider.py | 2 +- .../unit/multipass/test_multipass_provider.py | 2 +- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/craft_providers/base.py b/craft_providers/base.py index 2ae86563..3e4e3979 100644 --- a/craft_providers/base.py +++ b/craft_providers/base.py @@ -92,7 +92,7 @@ class Base(ABC): _timeout_complex: Optional[float] = TIMEOUT_COMPLEX _timeout_unpredictable: Optional[float] = TIMEOUT_UNPREDICTABLE alias: Enum - compatibility_tag: str = "base-v1" + compatibility_tag: str = "base-v2" @abstractmethod def __init__( diff --git a/tests/integration/lxd/test_launcher.py b/tests/integration/lxd/test_launcher.py index 03c1f4e9..d73cd451 100644 --- a/tests/integration/lxd/test_launcher.py +++ b/tests/integration/lxd/test_launcher.py @@ -38,7 +38,7 @@ def get_base_instance(): def _base_instance( image_name: str = "22.04", image_remote: str = "ubuntu", - compatibility_tag: str = "buildd-base-v1", + compatibility_tag: str = "buildd-base-v2", project: str = "default", ): """Get the base instance.""" @@ -301,7 +301,7 @@ def test_launch_create_base_instance_with_correct_image_description( assert ( lxc_result[0]["expanded_config"]["image.description"] - == "base-instance-buildd-base-v1-ubuntu-22.04" + == "base-instance-buildd-base-v2-ubuntu-22.04" ) @@ -646,7 +646,7 @@ def test_launch_instance_config_incompatible_without_auto_clean( assert exc_info.value.brief == ( "Incompatible base detected:" - " Expected image compatibility tag 'buildd-base-v1', found 'invalid'." + " Expected image compatibility tag 'buildd-base-v2', found 'invalid'." ) @@ -679,7 +679,7 @@ def test_launch_instance_not_setup_without_auto_clean( """Raise an error if an existing instance is not setup and auto_clean is False.""" core22_instance.push_file_io( destination=base_configuration._instance_config_path, - content=io.BytesIO(b"compatibility_tag: buildd-base-v1\nsetup: false\n"), + content=io.BytesIO(b"compatibility_tag: buildd-base-v2\nsetup: false\n"), file_mode="0644", ) @@ -700,7 +700,7 @@ def test_launch_instance_not_setup_with_auto_clean(base_configuration, core22_in """Clean the instance if it is not setup and auto_clean is True.""" core22_instance.push_file_io( destination=base_configuration._instance_config_path, - content=io.BytesIO(b"compatibility_tag: buildd-base-v1\nsetup: false\n"), + content=io.BytesIO(b"compatibility_tag: buildd-base-v2\nsetup: false\n"), file_mode="0644", ) diff --git a/tests/integration/multipass/test_launch.py b/tests/integration/multipass/test_launch.py index ee863f0f..19e9ce80 100644 --- a/tests/integration/multipass/test_launch.py +++ b/tests/integration/multipass/test_launch.py @@ -153,7 +153,7 @@ def test_launch_instance_config_incompatible_instance(core22_instance): assert exc_info.value.brief == ( "Incompatible base detected:" - " Expected image compatibility tag 'buildd-base-v1', found 'invalid'." + " Expected image compatibility tag 'buildd-base-v2', found 'invalid'." ) # Retry with auto_clean=True. @@ -174,7 +174,7 @@ def test_launch_instance_not_setup_without_auto_clean(core22_instance): core22_instance.push_file_io( destination=base_configuration._instance_config_path, - content=io.BytesIO(b"compatibility_tag: buildd-base-v1\nsetup: false\n"), + content=io.BytesIO(b"compatibility_tag: buildd-base-v2\nsetup: false\n"), file_mode="0644", ) @@ -196,7 +196,7 @@ def test_launch_instance_not_setup_with_auto_clean(core22_instance): core22_instance.push_file_io( destination=base_configuration._instance_config_path, - content=io.BytesIO(b"compatibility_tag: buildd-base-v1\nsetup: false\n"), + content=io.BytesIO(b"compatibility_tag: buildd-base-v2\nsetup: false\n"), file_mode="0644", ) diff --git a/tests/unit/actions/test_snap_installer.py b/tests/unit/actions/test_snap_installer.py index e738c627..81e91a48 100644 --- a/tests/unit/actions/test_snap_installer.py +++ b/tests/unit/actions/test_snap_installer.py @@ -55,7 +55,7 @@ def config_fixture(fake_home_temporary_file, request): """ config_content = textwrap.dedent( f"""\ - compatibility_tag: tag-foo-v1 + compatibility_tag: tag-foo-v2 snaps: test-name: revision: '{request.param}' diff --git a/tests/unit/bases/test_almalinux.py b/tests/unit/bases/test_almalinux.py index 2671a347..83b60b65 100644 --- a/tests/unit/bases/test_almalinux.py +++ b/tests/unit/bases/test_almalinux.py @@ -41,7 +41,7 @@ def mock_load(mocker): return mocker.patch( "craft_providers.instance_config.InstanceConfiguration.load", - return_value=InstanceConfiguration(compatibility_tag="almalinux-base-v1"), + return_value=InstanceConfiguration(compatibility_tag="almalinux-base-v2"), ) @@ -150,7 +150,7 @@ def mock_get_os_release(mocker): ], ) @pytest.mark.parametrize( - ("tag", "expected_tag"), [(None, "almalinux-base-v1"), ("test-tag", "test-tag")] + ("tag", "expected_tag"), [(None, "almalinux-base-v2"), ("test-tag", "test-tag")] ) def test_setup( fake_process, @@ -654,7 +654,7 @@ def test_ensure_image_version_compatible_failure(fake_executor, monkeypatch): base_config._ensure_instance_config_compatible(executor=fake_executor) assert exc_info.value == BaseCompatibilityError( - "Expected image compatibility tag 'almalinux-base-v1', found 'invalid-tag'" + "Expected image compatibility tag 'almalinux-base-v2', found 'invalid-tag'" ) @@ -1057,7 +1057,7 @@ def test_update_setup_status(fake_executor, mock_load, status): assert fake_executor.records_of_push_file_io == [ { "content": ( - "compatibility_tag: almalinux-base-v1\n" + "compatibility_tag: almalinux-base-v2\n" f"setup: {str(status).lower()}\n".encode() ), "destination": "/etc/craft-instance.conf", @@ -1163,7 +1163,7 @@ def test_ensuresetup_completed_not_setup(status, fake_executor, mock_load): ) def test_warmup_overall(environment, fake_process, fake_executor, mock_load, mocker): mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=True + compatibility_tag="almalinux-base-v2", setup=True ) alias = almalinux.AlmaLinuxBaseAlias.NINE @@ -1211,7 +1211,7 @@ def test_warmup_overall(environment, fake_process, fake_executor, mock_load, moc def test_warmup_bad_os(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=True + compatibility_tag="almalinux-base-v2", setup=True ) base_config = almalinux.AlmaLinuxBase( alias=almalinux.AlmaLinuxBaseAlias.NINE, @@ -1236,7 +1236,7 @@ def test_warmup_bad_os(fake_process, fake_executor, mock_load): def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=True + compatibility_tag="almalinux-base-v2", setup=True ) alias = almalinux.AlmaLinuxBaseAlias.NINE base_config = almalinux.AlmaLinuxBase( @@ -1265,7 +1265,7 @@ def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): """Raise a BaseConfigurationError if the instance is not setup.""" mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=setup + compatibility_tag="almalinux-base-v2", setup=setup ) alias = almalinux.AlmaLinuxBaseAlias.NINE base_config = almalinux.AlmaLinuxBase( @@ -1293,7 +1293,7 @@ def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): def test_warmup_never_ready(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=True + compatibility_tag="almalinux-base-v2", setup=True ) alias = almalinux.AlmaLinuxBaseAlias.NINE base_config = almalinux.AlmaLinuxBase( @@ -1326,7 +1326,7 @@ def test_warmup_never_ready(fake_process, fake_executor, mock_load): def test_warmup_never_network(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="almalinux-base-v1", setup=True + compatibility_tag="almalinux-base-v2", setup=True ) alias = almalinux.AlmaLinuxBaseAlias.NINE base_config = almalinux.AlmaLinuxBase( diff --git a/tests/unit/bases/test_centos_7.py b/tests/unit/bases/test_centos_7.py index 281b1185..3f5358de 100644 --- a/tests/unit/bases/test_centos_7.py +++ b/tests/unit/bases/test_centos_7.py @@ -41,7 +41,7 @@ def mock_load(mocker): return mocker.patch( "craft_providers.instance_config.InstanceConfiguration.load", - return_value=InstanceConfiguration(compatibility_tag="centos-base-v1"), + return_value=InstanceConfiguration(compatibility_tag="centos-base-v2"), ) @@ -151,7 +151,7 @@ def mock_get_os_release(mocker): ], ) @pytest.mark.parametrize( - ("tag", "expected_tag"), [(None, "centos-base-v1"), ("test-tag", "test-tag")] + ("tag", "expected_tag"), [(None, "centos-base-v2"), ("test-tag", "test-tag")] ) def test_setup( fake_process, @@ -604,7 +604,7 @@ def test_ensure_image_version_compatible_failure(fake_executor, monkeypatch): base_config._ensure_instance_config_compatible(executor=fake_executor) assert exc_info.value == BaseCompatibilityError( - "Expected image compatibility tag 'centos-base-v1', found 'invalid-tag'" + "Expected image compatibility tag 'centos-base-v2', found 'invalid-tag'" ) @@ -1004,7 +1004,7 @@ def test_update_setup_status(fake_executor, mock_load, status): assert fake_executor.records_of_push_file_io == [ { "content": ( - "compatibility_tag: centos-base-v1\n" + "compatibility_tag: centos-base-v2\n" f"setup: {str(status).lower()}\n".encode() ), "destination": "/etc/craft-instance.conf", @@ -1110,7 +1110,7 @@ def test_ensure_setup_completed_not_setup(status, fake_executor, mock_load): ) def test_warmup_overall(environment, fake_process, fake_executor, mock_load, mocker): mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=True + compatibility_tag="centos-base-v2", setup=True ) alias = centos.CentOSBaseAlias.SEVEN @@ -1158,7 +1158,7 @@ def test_warmup_overall(environment, fake_process, fake_executor, mock_load, moc def test_warmup_bad_os(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=True + compatibility_tag="centos-base-v2", setup=True ) base_config = centos.CentOSBase( alias=centos.CentOSBaseAlias.SEVEN, @@ -1183,7 +1183,7 @@ def test_warmup_bad_os(fake_process, fake_executor, mock_load): def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=True + compatibility_tag="centos-base-v2", setup=True ) alias = centos.CentOSBaseAlias.SEVEN base_config = centos.CentOSBase( @@ -1212,7 +1212,7 @@ def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): """Raise a BaseConfigurationError if the instance is not setup.""" mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=setup + compatibility_tag="centos-base-v2", setup=setup ) alias = centos.CentOSBaseAlias.SEVEN base_config = centos.CentOSBase( @@ -1240,7 +1240,7 @@ def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): def test_warmup_never_ready(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=True + compatibility_tag="centos-base-v2", setup=True ) alias = centos.CentOSBaseAlias.SEVEN base_config = centos.CentOSBase( @@ -1273,7 +1273,7 @@ def test_warmup_never_ready(fake_process, fake_executor, mock_load): def test_warmup_never_network(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="centos-base-v1", setup=True + compatibility_tag="centos-base-v2", setup=True ) alias = centos.CentOSBaseAlias.SEVEN base_config = centos.CentOSBase( diff --git a/tests/unit/bases/test_instance_config.py b/tests/unit/bases/test_instance_config.py index 57634e35..4744a342 100644 --- a/tests/unit/bases/test_instance_config.py +++ b/tests/unit/bases/test_instance_config.py @@ -29,7 +29,7 @@ @pytest.fixture() def default_config_data(): return { - "compatibility_tag": "tag-foo-v1", + "compatibility_tag": "tag-foo-v2", "setup": True, "snaps": { "charmcraft": {"revision": 834}, @@ -66,7 +66,7 @@ def test_instance_config_defaults(): def test_save(mock_executor): - config = InstanceConfiguration(compatibility_tag="tag-foo-v1") + config = InstanceConfiguration(compatibility_tag="tag-foo-v2") config_path = pathlib.PurePosixPath("/etc/crafty-crafty.conf") config.save(executor=mock_executor, config_path=config_path) @@ -79,7 +79,7 @@ def test_save(mock_executor): assert ( mock_executor.mock_calls[0].kwargs["content"].read() - == b"compatibility_tag: tag-foo-v1\n" + == b"compatibility_tag: tag-foo-v2\n" ) @@ -119,7 +119,7 @@ def test_load_with_valid_config(mock_executor, config_fixture, default_config_da assert config_instance is not None assert dict(config_instance) == { - "compatibility_tag": "tag-foo-v1", + "compatibility_tag": "tag-foo-v2", "setup": True, "snaps": {"charmcraft": {"revision": 834}, "core22": {"revision": 147}}, } diff --git a/tests/unit/bases/test_ubuntu_buildd.py b/tests/unit/bases/test_ubuntu_buildd.py index 9f352f6f..a1ebbb04 100644 --- a/tests/unit/bases/test_ubuntu_buildd.py +++ b/tests/unit/bases/test_ubuntu_buildd.py @@ -41,7 +41,7 @@ def mock_load(mocker): return mocker.patch( "craft_providers.instance_config.InstanceConfiguration.load", - return_value=InstanceConfiguration(compatibility_tag="buildd-base-v1"), + return_value=InstanceConfiguration(compatibility_tag="buildd-base-v2"), ) @@ -146,7 +146,7 @@ def mock_get_os_release(mocker): ], ) @pytest.mark.parametrize( - ("tag", "expected_tag"), [(None, "buildd-base-v1"), ("test-tag", "test-tag")] + ("tag", "expected_tag"), [(None, "buildd-base-v2"), ("test-tag", "test-tag")] ) def test_setup( fake_process, @@ -682,7 +682,7 @@ def test_ensure_image_version_compatible_failure(fake_executor, monkeypatch): base_config._ensure_instance_config_compatible(executor=fake_executor) assert exc_info.value == BaseCompatibilityError( - "Expected image compatibility tag 'buildd-base-v1', found 'invalid-tag'" + "Expected image compatibility tag 'buildd-base-v2', found 'invalid-tag'" ) @@ -1403,7 +1403,7 @@ def test_update_setup_status(fake_executor, mock_load, status): assert fake_executor.records_of_push_file_io == [ { "content": ( - "compatibility_tag: buildd-base-v1\n" + "compatibility_tag: buildd-base-v2\n" f"setup: {str(status).lower()}\n".encode() ), "destination": "/etc/craft-instance.conf", @@ -1509,7 +1509,7 @@ def test_ensure_setup_completed_not_setup(status, fake_executor, mock_load): ) def test_warmup_overall(environment, fake_process, fake_executor, mock_load, mocker): mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=True + compatibility_tag="buildd-base-v2", setup=True ) alias = ubuntu.BuilddBaseAlias.JAMMY @@ -1558,7 +1558,7 @@ def test_warmup_overall(environment, fake_process, fake_executor, mock_load, moc def test_warmup_bad_os(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=True + compatibility_tag="buildd-base-v2", setup=True ) base_config = ubuntu.BuilddBase( alias=ubuntu.BuilddBaseAlias.JAMMY, @@ -1583,7 +1583,7 @@ def test_warmup_bad_os(fake_process, fake_executor, mock_load): def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=True + compatibility_tag="buildd-base-v2", setup=True ) alias = ubuntu.BuilddBaseAlias.JAMMY base_config = ubuntu.BuilddBase( @@ -1612,7 +1612,7 @@ def test_warmup_bad_instance_config(fake_process, fake_executor, mock_load): def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): """Raise a BaseConfigurationError if the instance is not setup.""" mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=setup + compatibility_tag="buildd-base-v2", setup=setup ) alias = ubuntu.BuilddBaseAlias.JAMMY base_config = ubuntu.BuilddBase( @@ -1640,7 +1640,7 @@ def test_warmup_not_setup(setup, fake_process, fake_executor, mock_load): def test_warmup_never_ready(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=True + compatibility_tag="buildd-base-v2", setup=True ) alias = ubuntu.BuilddBaseAlias.JAMMY base_config = ubuntu.BuilddBase( @@ -1672,7 +1672,7 @@ def test_warmup_never_ready(fake_process, fake_executor, mock_load): def test_warmup_never_network(fake_process, fake_executor, mock_load): mock_load.return_value = InstanceConfiguration( - compatibility_tag="buildd-base-v1", setup=True + compatibility_tag="buildd-base-v2", setup=True ) alias = ubuntu.BuilddBaseAlias.JAMMY base_config = ubuntu.BuilddBase( diff --git a/tests/unit/lxd/test_launcher.py b/tests/unit/lxd/test_launcher.py index de055231..8668085a 100644 --- a/tests/unit/lxd/test_launcher.py +++ b/tests/unit/lxd/test_launcher.py @@ -30,7 +30,7 @@ @pytest.fixture() def mock_base_configuration(): mock_base = Mock(spec=Base) - mock_base.compatibility_tag = "mock-compat-tag-v100" + mock_base.compatibility_tag = "mock-compat-tag-v200" mock_base.get_command_environment.return_value = {"foo": "bar"} return mock_base @@ -204,7 +204,7 @@ def test_launch_use_base_instance( default_command_environment={"foo": "bar"}, ), call( - name="base-instance-mock-compat-tag-v100-image-remote-image-name", + name="base-instance-mock-compat-tag-v200-image-remote-image-name", project="test-project", remote="test-remote", default_command_environment={"foo": "bar"}, @@ -292,7 +292,7 @@ def test_launch_use_existing_base_instance( default_command_environment={"foo": "bar"}, ), call( - name="base-instance-mock-compat-tag-v100-image-remote-image-name", + name="base-instance-mock-compat-tag-v200-image-remote-image-name", project="test-project", remote="test-remote", default_command_environment={"foo": "bar"}, @@ -406,7 +406,7 @@ def test_launch_existing_base_instance_invalid( default_command_environment={"foo": "bar"}, ), call( - name="base-instance-mock-compat-tag-v100-image-remote-image-name", + name="base-instance-mock-compat-tag-v200-image-remote-image-name", project="test-project", remote="test-remote", default_command_environment={"foo": "bar"}, @@ -937,7 +937,7 @@ def test_use_snapshots_deprecated( default_command_environment={"foo": "bar"}, ), call( - name="base-instance-mock-compat-tag-v100-image-remote-image-name", + name="base-instance-mock-compat-tag-v200-image-remote-image-name", project="test-project", remote="test-remote", default_command_environment={"foo": "bar"}, diff --git a/tests/unit/lxd/test_lxd_provider.py b/tests/unit/lxd/test_lxd_provider.py index 3bf8529e..99e34ed3 100644 --- a/tests/unit/lxd/test_lxd_provider.py +++ b/tests/unit/lxd/test_lxd_provider.py @@ -46,7 +46,7 @@ def mock_buildd_base_configuration(mocker): "craft_providers.bases.ubuntu.BuilddBase", autospec=True ) mock_base_config.alias = ubuntu.BuilddBaseAlias.JAMMY - mock_base_config.compatibility_tag = "buildd-base-v1" + mock_base_config.compatibility_tag = "buildd-base-v2" return mock_base_config diff --git a/tests/unit/multipass/test_multipass_provider.py b/tests/unit/multipass/test_multipass_provider.py index e778dbb4..523131ad 100644 --- a/tests/unit/multipass/test_multipass_provider.py +++ b/tests/unit/multipass/test_multipass_provider.py @@ -33,7 +33,7 @@ def mock_buildd_base_configuration(mocker): "craft_providers.bases.ubuntu.BuilddBase", autospec=True ) mock_base_config.alias = ubuntu.BuilddBaseAlias.JAMMY - mock_base_config.compatibility_tag = "buildd-base-v1" + mock_base_config.compatibility_tag = "buildd-base-v2" return mock_base_config