From 188feb233ab3549af46cf530c0ac31f0a66ac074 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 15 Aug 2017 14:34:57 +0300 Subject: dnf: expand dnf selftest to test signed package feeds [YOCTO #11209] (From OE-Core rev: 4d65421f381fc69397d7c61ba76488775e83e043) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- meta-selftest/files/signing/key.passphrase | 1 + meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py | 4 +++- meta/lib/oeqa/selftest/cases/runtime_test.py | 12 +++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta-selftest/files/signing/key.passphrase diff --git a/meta-selftest/files/signing/key.passphrase b/meta-selftest/files/signing/key.passphrase new file mode 100644 index 0000000000..5271a52680 --- /dev/null +++ b/meta-selftest/files/signing/key.passphrase @@ -0,0 +1 @@ +test123 diff --git a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py index 68e56f2c5e..6742e8c080 100644 --- a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py +++ b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py @@ -36,7 +36,9 @@ class DnfSelftest(DnfTest): self.tc.target.copyTo(temp_file, "/etc/yum.repos.d/oe-remote-repo.repo") import re - output_makecache = self.dnf('makecache') + # Use '-y' for non-interactive mode: automatically import the feed signing key + output_makecache = self.dnf('-y makecache') + self.assertTrue(re.match(r".*Failed to synchronize cache", output_makecache, re.DOTALL) is None, msg = "dnf makecache failed to synchronize repo: %s" %(output_makecache)) self.assertTrue(re.match(r".*Metadata cache created", output_makecache, re.DOTALL) is not None, msg = "dnf makecache failed: %s" %(output_makecache)) output_repoinfo = self.dnf('repoinfo') diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 27cf584ea5..673b1998ac 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -3,6 +3,7 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqem from oeqa.core.decorator.oeid import OETestID import os import re +import tempfile class TestExport(OESelftestTestCase): @@ -143,7 +144,16 @@ class TestImage(OESelftestTestCase): # in at the start of the on-image test features += 'PACKAGE_FEED_URIS = "http://bogus_ip:bogus_port"\n' features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' - features += 'PACKAGE_CLASSES = "package_rpm"' + features += 'PACKAGE_CLASSES = "package_rpm"\n' + + # Enable package feed signing + self.gpg_home = tempfile.TemporaryDirectory(prefix="oeqa-feed-sign-") + signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') + runCmd('gpg --batch --homedir %s --import %s' % (self.gpg_home.name, os.path.join(signing_key_dir, 'key.secret'))) + features += 'INHERIT += "sign_package_feed"\n' + features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' + features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') + features += 'GPG_PATH = "%s"\n' % self.gpg_home.name self.write_config(features) # Build core-image-sato and testimage -- cgit v1.2.3-54-g00ecf