Merge ~mwhudson/curtin:lp-1912801 into curtin:master

[Michael Hudson-Doyle]

apt_config: put added gpg in correct place in filesystem

LP: #1912801

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:e38cfafe61fe388c5b4e01a812879134279959ee
https://jenkins.ubuntu.com/server/job/curtin-ci/89/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/89/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/89/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/89/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/89/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/89//rebuild

review: Needs Fixing (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

The failures are that pylint flakiness.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:e38cfafe61fe388c5b4e01a812879134279959ee
https://jenkins.ubuntu.com/server/job/curtin-ci/91/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/91/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/91/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/91/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/91/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/91//rebuild

review: Approve (continuous-integration)

Unmerged commits

e38cfaf... by Michael Hudson-Doyle on 2021-01-26

apt_config: put added gpg in correct place in filesystem

diff --git a/curtin/commands/apt_config.py b/curtin/commands/apt_config.py
index ff906be..ad56322 100644
--- a/curtin/commands/apt_config.py
+++ b/curtin/commands/apt_config.py
@@ -343,7 +343,7 @@ def apply_preserve_sources_list(target):
         raise
 
 
-def add_apt_key_raw(filename, key, target=None):
+def add_apt_key_raw(filename, key, target):
     """
     actual adding of a key as defined in key argument
     to the system
@@ -355,7 +355,9 @@ def add_apt_key_raw(filename, key, target=None):
     else:
         target_keyfile_ext = '.gpg'
         omode = 'wb'
-    target_keyfile = paths.target_path(target, filename + target_keyfile_ext)
+    target_keyfile = paths.target_path(
+        target, os.path.join(
+            "/etc/apt/trusted.gpg.d", filename + target_keyfile_ext))
     util.write_file(target_keyfile, key, mode=0o644, omode=omode)
     LOG.debug("Adding key to '%s':\n'%s'", target_keyfile, key)
 
diff --git a/tests/unittests/test_apt_source.py b/tests/unittests/test_apt_source.py
index f8aac5a..5ca461e 100644
--- a/tests/unittests/test_apt_source.py
+++ b/tests/unittests/test_apt_source.py
@@ -1094,4 +1094,26 @@ class TestDebconfSelections(CiTestCase):
         apt_config.dpkg_reconfigure(['pkgfoo', 'pkgbar'])
         m_subp.assert_not_called()
 
+    @mock.patch("curtin.commands.apt_config.util.write_file")
+    def test_add_apt_key_raw_asc(self, m_write_file):
+        fname = self.random_string()
+        apt_config.add_apt_key_raw(fname, EXPECTEDKEY, '/target')
+        expected_call = mock.call(
+                '/target/etc/apt/trusted.gpg.d/{}.asc'.format(fname),
+                EXPECTEDKEY,
+                mode=0o644,
+                omode='w')
+        m_write_file.assert_has_calls([expected_call])
+
+    @mock.patch("curtin.commands.apt_config.util.write_file")
+    def test_add_apt_key_raw_bin(self, m_write_file):
+        fname = self.random_string()
+        apt_config.add_apt_key_raw(fname, EXPECTED_BINKEY, '/target')
+        expected_call = mock.call(
+                '/target/etc/apt/trusted.gpg.d/{}.gpg'.format(fname),
+                EXPECTED_BINKEY,
+                mode=0o644,
+                omode='wb')
+        m_write_file.assert_has_calls([expected_call])
+
 # vi: ts=4 expandtab syntax=python