Merge ~andersson123/lpci:devel-release-support into lpci:main

[Tim Andersson]

925ef1c... by Tim Andersson on 2024-03-06

progress

Unmerged commits

925ef1c... by Tim Andersson on 2024-03-06

progress

	test:0 (build)
	build:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

f3faba9... by Tim Andersson on 2024-02-29

feat: add support for running lpci on the development release

	test:0 (build)
	build:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

diff --git a/lpci/commands/run.py b/lpci/commands/run.py
index e42a8a9..c0ec942 100644
--- a/lpci/commands/run.py
+++ b/lpci/commands/run.py
@@ -11,6 +11,7 @@ import subprocess
 import tempfile
 from argparse import ArgumentParser, Namespace
 from pathlib import Path, PurePath
+from distro_info import UbuntuDistroInfo
 from tempfile import NamedTemporaryFile
 from typing import Dict, List, Optional, Set
 
@@ -425,6 +426,35 @@ def _install_apt_packages(
         )
 
 
+def _run_instance_command_silent(
+    command: str,
+    job_name: str,
+    job: Job,
+    instance: lxd.LXDInstance,
+    host_architecture: str,
+    remote_cwd: Path,
+    environment: Optional[Dict[str, Optional[str]]],
+    root: bool = True,
+) -> None:
+    full_run_cmd = ["bash", "--noprofile", "--norc", "-ec", command]
+    emit.message(f"Running command for the job: {full_run_cmd}")
+    with open("/dev/null", "w") as stream:
+        proc = instance.execute_run(
+            full_run_cmd,
+            cwd=remote_cwd,
+            env=environment,
+            stdout=stream,
+            stderr=stream,
+        )
+    if proc.returncode != 0:
+        raise CommandError(
+            f"Job {job_name!r} for "
+            f"{job.series}/{host_architecture} failed with "
+            f"exit status {proc.returncode}.",
+            retcode=proc.returncode,
+        )
+
+
 def _run_instance_command(
     command: str,
     job_name: str,
@@ -551,6 +581,7 @@ def _run_job(
         gpu_nvidia=gpu_nvidia,
         root=root,
     ) as instance:
+        # Has to go here?
         snaps = list(itertools.chain(*pm.hook.lpci_install_snaps()))
         for snap in snaps:
             emit.progress(
@@ -579,6 +610,46 @@ def _run_job(
                 environment=environment,
                 secrets=secrets,
             )
+        # try move it here
+        if job.series == "devel":
+            udi = UbuntuDistroInfo()
+            supported = udi.supported()
+            # only caveat is that distro-info-data must be up to date for this to work on
+            # the machine hosting the container.
+            devel = udi.devel()
+            if devel in supported:
+                supported.remove(devel)
+            job.series = supported[-1]
+            emit.message("Job series is 'devel', upgrading from latest release to development release.")
+            # with provider.launched_environment(
+            #     project_name=cwd.name,
+            #     project_path=cwd,
+            #     series=job.series,
+            #     architecture=host_architecture,
+            #     gpu_nvidia=gpu_nvidia,
+            #     root=root,
+            # ) as instance:
+            upgrade_commands = [
+                f"sed -i 's/{job.series}/{devel}/g' /etc/apt/sources.list",
+                "sudo DEBIAN_FRONTEND=noninteractive apt update -y",
+                "sudo DEBIAN_FRONTEND=noninteractive apt upgrade -y",
+                "sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y",
+                # "sudo DEBIAN_FRONTEND=noninteractive apt-get autoclean -y",
+                # "sudo DEBIAN_FRONTEND=noninteractive apt-get autoremove -y",
+                # neither of these two things cause the vm to shut off
+            ]
+            for cmd in upgrade_commands:
+                _run_instance_command_silent(
+                    command=cmd,
+                    job_name=job_name,
+                    job=job,
+                    instance=instance,
+                    host_architecture=host_architecture,
+                    remote_cwd=remote_cwd,
+                    environment=environment,
+                    root=root,
+                )
+                # gets up to here then for some reason the instance stops?
 
         if job.input is not None and output is not None:
             _copy_input_paths(job.input, remote_cwd, instance, output)
@@ -720,6 +791,9 @@ class RunCommand(BaseCommand):
 
         provider = get_provider()
         provider.ensure_provider_is_available()
+        # Actually I think we can do the upgrade here?
+        # Just after we've created the provider right?
+        # if args.
 
         secrets = {}
         if args.secrets_file:
diff --git a/lpci/providers/_lxd.py b/lpci/providers/_lxd.py
index c673502..83c97bc 100644
--- a/lpci/providers/_lxd.py
+++ b/lpci/providers/_lxd.py
@@ -285,6 +285,7 @@ class LXDProvider(Provider):
         :param series: Distribution series name.
         :param architecture: Targeted architecture name.
         """
+        # I guess this'd be somewhere I'd be looking at for looking at devel support
         alias = SERIES_TO_BUILDD_IMAGE_ALIAS[series]
         instance_name = self.get_instance_name(
             project_name=project_name,
@@ -347,6 +348,8 @@ class LXDProvider(Provider):
             )
         except (bases.BaseConfigurationError, lxd.LXDError) as error:
             raise CommandError(str(error)) from error
+        
+        # I think we want to upgrade here ?
 
         managed_project_path = get_managed_environment_project_path()
         try:
diff --git a/requirements.in b/requirements.in
index 7cdae3e..fdc1bd7 100644
--- a/requirements.in
+++ b/requirements.in
@@ -2,6 +2,7 @@ craft-cli
 craft-providers>=1.19.0  # 1.19.0 added support of bases.BuilddBaseAlias.MANTIC
 launchpadlib[keyring]
 pydantic
+distro-info
 PyYAML>=6.0.1  # 6.0.0 is not compatible with a current cython version
 python-dotenv
 pluggy
diff --git a/setup.cfg b/setup.cfg
index edde67e..35001e2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,7 @@ install_requires =
     launchpadlib[keyring]
     lazr.restfulclient
     pluggy
+    distro-info
     pydantic
     python-dotenv
 python_requires = >=3.8