ci: helper: Drop the _make_run method

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>
This commit is contained in:
Erik Skultety 2023-08-24 13:30:46 +02:00
parent 1e77c9c834
commit 3bcf326150

View File

@ -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)