[libvirt PATCH 33/33] ci: helper: Drop the _make_run method

Erik Skultety posted 33 patches 2 years, 5 months ago
There is a newer version of this series
[libvirt PATCH 33/33] ci: helper: Drop the _make_run method
Posted by Erik Skultety 2 years, 5 months ago
We've successfully migrated over to lcitool to take care of the
container workload execution, so dropping this 'make' prep code is a
prerequisite of finally getting rid of the ci/Makefile script.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---
 ci/helper | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/ci/helper b/ci/helper
index 0053fce40e..e45eb63016 100755
--- a/ci/helper
+++ b/ci/helper
@@ -6,7 +6,6 @@
 import argparse
 import os
 import pathlib
-import pty
 import subprocess
 import sys
 import textwrap
@@ -148,30 +147,6 @@ class Application:
         self._args = Parser().parse()
         self._repo = None
 
-    def _make_run(self, target):
-        args = [
-            "-C",
-            self._basedir,
-            target,
-        ]
-
-        if self._args.action in ["build", "test", "shell"]:
-            args.extend([
-                f"CI_ENGINE={self._args.engine}",
-                f"CI_USER_LOGIN={self._args.login}",
-                f"CI_IMAGE_PREFIX={self._args.image_prefix}",
-                f"CI_IMAGE_TAG={self._args.image_tag}",
-            ])
-
-        if self._args.action in ["build", "test"]:
-            args.extend([
-                f"MESON_ARGS={self._args.meson_args}",
-                f"NINJA_ARGS={self._args.ninja_args}",
-            ])
-
-        if pty.spawn(["make"] + args) != 0:
-            sys.exit("error: 'make' failed")
-
     @staticmethod
     def _prepare_repo_copy(repo, dest):
         return repo.clone(dest, local=True)
-- 
2.41.0
Re: [libvirt PATCH 33/33] ci: helper: Drop the _make_run method
Posted by Daniel P. Berrangé 2 years, 5 months ago
On Fri, Aug 25, 2023 at 07:55:41PM +0200, Erik Skultety wrote:
> We've successfully migrated over to lcitool to take care of the
> container workload execution, so dropping this 'make' prep code is a
> prerequisite of finally getting rid of the ci/Makefile script.
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
>  ci/helper | 25 -------------------------
>  1 file changed, 25 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|