From 3bcf326150e857df13bd87fc80cdd5ad5e80429d Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Thu, 24 Aug 2023 13:30:46 +0200 Subject: [PATCH] ci: helper: Drop the _make_run method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel P. Berrangé --- ci/helper | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/ci/helper b/ci/helper index c734629731..93508515ca 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)