diff options
| -rw-r--r-- | meta/classes-recipe/testimage.bbclass | 55 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/dnf.py | 46 |
2 files changed, 43 insertions, 58 deletions
diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index d53f1a3d6f1..ac32ea06c95 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -219,10 +219,6 @@ def testimage_main(d): testimage_sanity(d) - if (d.getVar('IMAGE_PKGTYPE') == 'rpm' - and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))): - create_rpm_index(d) - logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) pn = d.getVar("PN") @@ -429,57 +425,6 @@ def get_runtime_paths(d): paths.append(path) return paths -def create_index(arg): - import subprocess - - index_cmd = arg - try: - bb.note("Executing '%s' ..." % index_cmd) - result = subprocess.check_output(index_cmd, - stderr=subprocess.STDOUT, - shell=True) - result = result.decode('utf-8') - except subprocess.CalledProcessError as e: - return("Index creation command '%s' failed with return code " - '%d:\n%s' % (e.cmd, e.returncode, e.output.decode("utf-8"))) - if result: - bb.note(result) - return None - -def create_rpm_index(d): - import glob - # Index RPMs - rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo_c") - index_cmds = [] - archs = (d.getVar('ALL_MULTILIB_PACKAGE_ARCHS') or '').replace('-', '_') - - for arch in archs.split(): - rpm_dir = os.path.join(d.getVar('DEPLOY_DIR_RPM'), arch) - idx_path = os.path.join(d.getVar('WORKDIR'), 'oe-testimage-repo', arch) - - if not os.path.isdir(rpm_dir): - continue - - lockfilename = os.path.join(d.getVar('DEPLOY_DIR_RPM'), 'rpm.lock') - lf = bb.utils.lockfile(lockfilename, False) - oe.path.copyhardlinktree(rpm_dir, idx_path) - # Full indexes overload a 256MB image so reduce the number of rpms - # in the feed by filtering to specific packages needed by the tests. - package_list = glob.glob(idx_path + "*/*.rpm") - - for pkg in package_list: - basename = os.path.basename(pkg) - if basename.startswith("curl-ptest") or not basename.startswith("curl"): - bb.utils.remove(pkg) - - bb.utils.unlockfile(lf) - cmd = '%s --update -q %s' % (rpm_createrepo, idx_path) - - # Create repodata - result = create_index(cmd) - if result: - bb.fatal('%s' % ('\n'.join(result))) - def package_extraction(d, test_suites): from oeqa.utils.package_manager import find_packages_to_extract from oeqa.utils.package_manager import extract_packages diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index ef8bebfec0e..aa49a6d50c4 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py @@ -12,12 +12,52 @@ from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.data import skipIfNotDataVar, skipIfNotFeature from oeqa.runtime.decorator.package import OEHasPackage +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class DnfTest(OERuntimeTestCase): @classmethod + def create_rpm_index(cls): + import glob + import subprocess + import oe + + archs = (cls.tc.td['ALL_MULTILIB_PACKAGE_ARCHS'] or '').replace('-', '_') + for arch in archs.split(): + rpm_dir = os.path.join(cls.tc.td['DEPLOY_DIR_RPM'], arch) + idx_path = os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo', arch) + + if not os.path.isdir(rpm_dir): + continue + + lockfilename = os.path.join(cls.tc.td['DEPLOY_DIR_RPM'], 'rpm.lock') + lf = bb.utils.lockfile(lockfilename, False) + oe.path.copyhardlinktree(rpm_dir, idx_path) + # Full indexes overload a 256MB image so reduce the number of rpms + # in the feed by filtering to specific packages needed by the tests. + package_list = glob.glob(os.path.jon(idx_path, "*", "*.rpm")) + + for pkg in package_list: + basename = os.path.basename(pkg) + if basename.startswith("curl-ptest") or not basename.startswith("curl"): + bb.utils.remove(pkg) + + bb.utils.unlockfile(lf) + + # Create repodata + try: + cmd = 'createrepo_c --update -q %s' % (idx_path) + bb.note("Executing '%s'" % cmd) + subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True) + except subprocess.CalledProcessError as e: + bb.fatal("Index creation failed with return code %d: %s" % (e.returncode, e.output)) + + @classmethod def setUpClass(cls): - cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo'), - '0.0.0.0', port=cls.tc.target.server_port, - logger=cls.tc.logger) + cls.create_rpm_index() + #repo_dir = cls.tc.td['DEPLOY_DIR_RPM'] + repo_dir = os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo') + cls.repo_server = HTTPService(repo_dir, '0.0.0.0', port=cls.tc.target.server_port, logger=cls.tc.logger) cls.repo_server.start() @classmethod |