]> code.ossystems Code Review - openembedded-core.git/commitdiff
oe-selftest: no need to parse gpg output to determine the name of the signing key
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Thu, 16 Feb 2017 14:36:35 +0000 (16:36 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 15 May 2018 10:00:30 +0000 (11:00 +0100)
The parsing fails on my machine, and we use a key with a hardcoded name,
and so can provide it directly.

(From OE-Core rev: b69bad2c4e51a24868422f39619a0598fd2a0533)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/lib/oeqa/selftest/signing.py

index 02e5f5ad29dd46434c3bb8953b0401081613ea49..9f501a5ea095ee479a35a038e65fc2193d76728d 100644 (file)
@@ -104,13 +104,7 @@ class Signing(oeSelfTest):
         self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe)
         self.add_command_to_tearDown('rm -rf %s' % sstatedir)
 
-        # Determine the pub key signature
-        ret = runCmd('gpg --homedir %s --list-keys' % self.gpg_dir)
-        pub_key = re.search(r'^pub\s+\S+/(\S+)\s+', ret.output, re.M)
-        self.assertIsNotNone(pub_key, 'Failed to determine the public key signature.')
-        pub_key = pub_key.group(1)
-
-        feature = 'SSTATE_SIG_KEY ?= "%s"\n' % pub_key
+        feature = 'SSTATE_SIG_KEY ?= "testuser"\n'
         feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n'
         feature += 'SSTATE_VERIFY_SIG ?= "1"\n'
         feature += 'GPG_PATH = "%s"\n' % self.gpg_dir