bases: support creating charms use CentOS 7 as base (#1065)

needs Ubuntu 18.04 for cgroup v1

needs craft-providers unreleased version.

CRAFT-1697

Author: syu-w

charmcraft/commands/build.py

@@ -25,6 +25,7 @@
 from typing import List, Optional
 
 from craft_cli import emit, CraftError
+from craft_providers.bases import get_base_alias
 
 from charmcraft import env, linters, parts, providers, instrum
 from charmcraft.charm_builder import DISPATCH_FILENAME, HOOKS_DIR
@@ -344,7 +345,7 @@ def pack_charm_in_instance(
             "(may take a while the first time but it's reusable)"
         )
 
-        build_base = providers.BASE_CHANNEL_TO_PROVIDER_BASE[build_on.channel]
+        build_base_alias = get_base_alias((build_on.name, build_on.channel))
         instance_name = providers.get_instance_name(
             bases_index=bases_index,
             build_on_index=build_on_index,
@@ -353,16 +354,24 @@ def pack_charm_in_instance(
             target_arch=get_host_architecture(),
         )
         base_configuration = providers.get_base_configuration(
-            alias=build_base,
+            alias=build_base_alias,
             instance_name=instance_name,
         )
 
+        if build_on.name != "ubuntu":
+            allow_unstable = True
+            emit.message(
+                f"Warning: Base {build_on.name} {build_on.channel} daily image may be unstable."
+            )
+        else:
+            allow_unstable = False
+
         with self.provider.launched_environment(
             project_name=self.metadata.name,
             project_path=self.charmdir,
             base_configuration=base_configuration,
-            build_base=build_base.value,
             instance_name=instance_name,
+            allow_unstable=allow_unstable,
         ) as instance:
             emit.debug("Mounting directory inside the instance")
             with instrum.Timer("Mounting directory"):

charmcraft/parts.py

@@ -20,7 +20,7 @@
 import pathlib
 import shlex
 import sys
-from typing import Any, Dict, List, Set, Optional, cast
+from typing import Any, Dict, List, Optional, Set, cast
 from contextlib import suppress
 
 import pydantic
@@ -166,6 +166,13 @@ def get_build_packages(self) -> Set[str]:
                 if (os_release.id(), os_release.version_id()) in (("centos", "7"), ("rhel", "7")):
                     # CentOS 7 Python 3.8 from SCL repo
                     return {
+                        "autoconf",
+                        "automake",
+                        "gcc",
+                        "gcc-c++",
+                        "git",
+                        "make",
+                        "patch",
                         "rh-python38-python-devel",
                         "rh-python38-python-pip",
                         "rh-python38-python-setuptools",
@@ -175,6 +182,13 @@ def get_build_packages(self) -> Set[str]:
                 pass
 
             return {
+                "autoconf",
+                "automake",
+                "gcc",
+                "gcc-c++",
+                "git",
+                "make",
+                "patch",
                 "python3-devel",
                 "python3-pip",
                 "python3-setuptools",

charmcraft/providers.py

@@ -16,16 +16,20 @@
 
 """Charmcraft-specific code to interface with craft-providers."""
 
+import enum
 import os
 import pathlib
 import sys
 from typing import Dict, List, NamedTuple, Optional, Tuple, Union
 
 from craft_cli import emit, CraftError
-from craft_providers import Executor, Provider, ProviderError, bases, lxd, multipass
+from craft_providers import Base, Executor, Provider, ProviderError, lxd, multipass
+from craft_providers.bases import get_base_alias, get_base_from_alias, BASE_NAME_TO_BASE_ALIAS
+from craft_providers.errors import BaseConfigurationError
+from craft_providers.actions.snap_installer import Snap
 
 from charmcraft.bases import check_if_base_matches_host
-from charmcraft.config import Base, BasesConfiguration
+from charmcraft.config import BasesConfiguration
 from charmcraft.env import (
     get_managed_environment_snap_channel,
     get_managed_environment_log_path,
@@ -36,13 +40,6 @@
 from charmcraft.snap import get_snap_configuration
 
 
-BASE_CHANNEL_TO_PROVIDER_BASE = {
-    "18.04": bases.BuilddBaseAlias.BIONIC,
-    "20.04": bases.BuilddBaseAlias.FOCAL,
-    "22.04": bases.BuilddBaseAlias.JAMMY,
-}
-
-
 class Plan(NamedTuple):
     """A build plan for a particular base.
 
@@ -122,9 +119,9 @@ def create_build_plan(
     return build_plan
 
 
-def get_command_environment() -> Dict[str, str]:
+def get_command_environment(base: Base) -> Dict[str, str]:
     """Construct the required environment."""
-    env = bases.buildd.default_command_environment()
+    env = base.default_command_environment()
     env["CHARMCRAFT_MANAGED_MODE"] = "1"
 
     # Pass-through host environment that target may need.
@@ -171,25 +168,25 @@ def get_instance_name(
 
 def get_base_configuration(
     *,
-    alias: bases.BuilddBaseAlias,
+    alias: enum.Enum,
     instance_name: str,
-) -> bases.BuilddBase:
-    """Create a BuilddBase configuration."""
-    environment = get_command_environment()
-
+) -> Base:
+    """Create a Base configuration."""
     # injecting a snap on a non-linux system is not supported, so default to
     # install charmcraft from the store's stable channel
     snap_channel = get_managed_environment_snap_channel()
     if snap_channel is None and sys.platform != "linux":
         snap_channel = "stable"
 
-    charmcraft_snap = bases.buildd.Snap(name="charmcraft", channel=snap_channel, classic=True)
-    return bases.BuilddBase(
+    base = get_base_from_alias(alias)
+    charmcraft_snap = Snap(name="charmcraft", channel=snap_channel, classic=True)
+    environment = get_command_environment(base)
+    return base(
         alias=alias,
         environment=environment,
         hostname=instance_name,
         snaps=[charmcraft_snap],
-        compatibility_tag=f"charmcraft-{bases.BuilddBase.compatibility_tag}.0",
+        compatibility_tag=f"charmcraft-{base.compatibility_tag}.0",
     )
 
 
@@ -244,18 +241,21 @@ def is_base_available(base: Base) -> Tuple[bool, Union[str, None]]:
             f"host architecture {arch!r} not in base architectures {base.architectures!r}",
         )
 
-    if base.name != "ubuntu":
+    if base.name not in ("ubuntu", "centos"):
         return (
             False,
-            f"name {base.name!r} is not yet supported (must be 'ubuntu')",
+            f"name {base.name!r} is not yet supported (must be 'ubuntu' or 'centos')",
         )
 
-    if base.channel not in BASE_CHANNEL_TO_PROVIDER_BASE:
-        *firsts, last = sorted(BASE_CHANNEL_TO_PROVIDER_BASE)
+    try:
+        get_base_alias((base.name, base.channel))
+    except BaseConfigurationError:
+        *firsts, last = sorted((" ".join(s) for s in BASE_NAME_TO_BASE_ALIAS))
         allowed = f"{', '.join(map(repr, firsts))} or {last!r}"
         return (
             False,
-            f"channel {base.channel!r} is not yet supported (must be {allowed})",
+            f"base {base.name!r} channel {base.channel!r} is not yet supported "
+            f"(must be {allowed})",
         )
 
     return True, None

requirements-dev.txt

@@ -10,7 +10,7 @@ colorama==0.4.6
 coverage==7.2.3
 craft-cli==1.2.0
 craft-parts==1.19.1
-craft-providers==1.10.0
+craft-providers==1.11.0
 craft-store==2.4.0
 cryptography==40.0.2
 Deprecated==1.2.13

requirements.txt

@@ -4,7 +4,7 @@ cffi==1.15.1
 charset-normalizer==3.1.0
 craft-cli==1.2.0
 craft-parts==1.19.1
-craft-providers==1.10.0
+craft-providers==1.11.0
 craft-store==2.4.0
 cryptography==40.0.2
 Deprecated==1.2.13