chore: remove kinetic (#402)

Ubuntu 22.10 (kinetic) is an interim release and has reached end of life. Signed-off-by: Callahan Kovacs <[email protected]> Co-authored-by: Tiago Nobrega <[email protected]>
canonical · Sep 19, 2023 · 4c400b1 · 4c400b1
1 parent c9ba62b
commit 4c400b1
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 18 deletions.
diff --git a/craft_providers/bases/__init__.py b/craft_providers/bases/__init__.py
@@ -59,7 +59,6 @@ class BaseName(NamedTuple):
     BaseName("ubuntu", "18.04"): ubuntu.BuilddBaseAlias.BIONIC,
     BaseName("ubuntu", "20.04"): ubuntu.BuilddBaseAlias.FOCAL,
     BaseName("ubuntu", "22.04"): ubuntu.BuilddBaseAlias.JAMMY,
-    BaseName("ubuntu", "22.10"): ubuntu.BuilddBaseAlias.KINETIC,
     BaseName("ubuntu", "23.04"): ubuntu.BuilddBaseAlias.LUNAR,
     BaseName("ubuntu", "devel"): ubuntu.BuilddBaseAlias.DEVEL,
     BaseName("centos", "7"): centos.CentOSBaseAlias.SEVEN,

diff --git a/craft_providers/bases/ubuntu.py b/craft_providers/bases/ubuntu.py
@@ -43,7 +43,6 @@ class BuilddBaseAlias(enum.Enum):
     BIONIC = "18.04"
     FOCAL = "20.04"
     JAMMY = "22.04"
-    KINETIC = "22.10"
     LUNAR = "23.04"
     DEVEL = "devel"
 

diff --git a/craft_providers/lxd/remotes.py b/craft_providers/lxd/remotes.py
@@ -35,7 +35,7 @@
 BUILDD_RELEASES_REMOTE_NAME = "craft-com.ubuntu.cloud-buildd"
 BUILDD_RELEASES_REMOTE_ADDRESS = "https://cloud-images.ubuntu.com/buildd/releases"
 
-# XXX: lunar and kinetic buildd daily images are not working (LP #2007419)
+# XXX: lunar buildd daily images are not working (LP #2007419)
 BUILDD_DAILY_REMOTE_NAME = "craft-com.ubuntu.cloud-buildd-daily"
 BUILDD_DAILY_REMOTE_ADDRESS = "https://cloud-images.ubuntu.com/buildd/daily"
 
@@ -144,12 +144,6 @@ def add_remote(self, lxc: LXC) -> None:
         remote_address=BUILDD_RELEASES_REMOTE_ADDRESS,
         remote_protocol=ProtocolType.SIMPLESTREAMS,
     ),
-    ubuntu.BuilddBaseAlias.KINETIC: RemoteImage(
-        image_name="kinetic",
-        remote_name=DAILY_REMOTE_NAME,
-        remote_address=DAILY_REMOTE_ADDRESS,
-        remote_protocol=ProtocolType.SIMPLESTREAMS,
-    ),
     ubuntu.BuilddBaseAlias.LUNAR: RemoteImage(
         image_name="lunar",
         remote_name=DAILY_REMOTE_NAME,

diff --git a/craft_providers/multipass/multipass_provider.py b/craft_providers/multipass/multipass_provider.py
@@ -96,10 +96,6 @@ def name(self) -> str:
     ubuntu.BuilddBaseAlias.JAMMY: RemoteImage(
         remote=Remote.SNAPCRAFT, image_name="22.04"
     ),
-    # kinetic image is not available on macos
-    ubuntu.BuilddBaseAlias.KINETIC: RemoteImage(
-        remote=Remote.RELEASE, image_name="kinetic"
-    ),
     ubuntu.BuilddBaseAlias.LUNAR: RemoteImage(
         remote=Remote.RELEASE, image_name="lunar"
     ),

diff --git a/tests/integration/multipass/test_multipass_provider.py b/tests/integration/multipass/test_multipass_provider.py
@@ -48,9 +48,6 @@ def test_create_environment(installed_multipass, instance_name):
 def test_launched_environment(alias, installed_multipass, instance_name, tmp_path):
     """Verify `launched_environment()` creates and starts an instance then stops
     the instance when the method loses context."""
-    if sys.platform == "darwin" and alias == BuilddBaseAlias.KINETIC:
-        pytest.skip(reason="previous interim releases are not available on MacOS")
-
     if sys.platform == "darwin" and alias == BuilddBaseAlias.DEVEL:
         pytest.skip(reason="snapcraft:devel is not working on MacOS (LP #2007419)")
 

diff --git a/tests/unit/lxd/test_remotes.py b/tests/unit/lxd/test_remotes.py
@@ -145,7 +145,6 @@ def test_add_remote_race_condition_error(fake_remote_image, mock_lxc, logs):
         (ubuntu.BuilddBaseAlias.BIONIC, "core18"),
         (ubuntu.BuilddBaseAlias.FOCAL, "core20"),
         (ubuntu.BuilddBaseAlias.JAMMY, "core22"),
-        (ubuntu.BuilddBaseAlias.KINETIC, "kinetic"),
         (ubuntu.BuilddBaseAlias.LUNAR, "lunar"),
         (ubuntu.BuilddBaseAlias.DEVEL, "devel"),
     ],
@@ -164,7 +163,6 @@ def test_get_image_remote(provider_base_alias, image_name):
         (ubuntu.BuilddBaseAlias.BIONIC, "core18"),
         (ubuntu.BuilddBaseAlias.FOCAL, "core20"),
         (ubuntu.BuilddBaseAlias.JAMMY, "core22"),
-        (ubuntu.BuilddBaseAlias.KINETIC, "kinetic"),
         (ubuntu.BuilddBaseAlias.LUNAR, "lunar"),
         (ubuntu.BuilddBaseAlias.DEVEL, "devel"),
     ],