]> xenbits.xensource.com Git - libvirt.git/commitdiff
ci: helper: Drop the _make_run method
authorErik Skultety <eskultet@redhat.com>
Thu, 24 Aug 2023 11:30:46 +0000 (13:30 +0200)
committerErik Skultety <eskultet@redhat.com>
Tue, 12 Sep 2023 09:36:03 +0000 (11:36 +0200)
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
ci/helper

index c734629731794d4d2787321e520f2352617a87de..93508515cac83820a936fb454d98cc8b1b78d6ef 100755 (executable)
--- 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)