launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:sign-android-kernel into launchpad:master with ~ilasc/launchpad:sign-android-kernel as a prerequisite.

Commit message:
Sign Android kernel boot images

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/405241

This is just a small fix on top of https://code.launchpad.net/~ilasc/launchpad/+git/launchpad/+merge/404759, since Ioana's out for the week and we want to keep this moving.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:sign-android-kernel into launchpad:master.

diff --git a/lib/lp/archivepublisher/signing.py b/lib/lp/archivepublisher/signing.py
index 9c05737..296e626 100644
--- a/lib/lp/archivepublisher/signing.py
+++ b/lib/lp/archivepublisher/signing.py
@@ -400,8 +400,7 @@ class SigningUpload(CustomUpload):
             raise SigningServiceError(
                 "Could not sign message with key %s: %s" % (signing_key, e))
 
-        if key_type in (SigningKeyType.UEFI, SigningKeyType.FIT,
-                        SigningKeyType.ANDROID_KERNEL):
+        if key_type in (SigningKeyType.UEFI, SigningKeyType.FIT):
             file_suffix = ".signed"
             public_key_suffix = ".crt"
         else:
diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
index 1f97913..8e01ca1 100644
--- a/lib/lp/archivepublisher/tests/test_signing.py
+++ b/lib/lp/archivepublisher/tests/test_signing.py
@@ -1655,8 +1655,8 @@ class TestSigningUploadWithSigningService(TestSigningHelpers):
                 '1.0/control/fit.crt',
                 '1.0/empty.cv2-kernel', '1.0/empty.cv2-kernel.sig',
                 '1.0/control/cv2-kernel.pub',
-                '1.0/empty.android-kernel', '1.0/empty.android-kernel.signed',
-                '1.0/control/android-kernel.crt',
+                '1.0/empty.android-kernel', '1.0/empty.android-kernel.sig',
+                '1.0/control/android-kernel.x509',
                 ], tarball.getnames())
         self.assertEqual(0, self.signing_service_client.generate.call_count)
         keys = self.signing_keys
@@ -1710,7 +1710,7 @@ class TestSigningUploadWithSigningService(TestSigningHelpers):
             "1.0/empty.sipl.sig", "1.0/control/sipl.x509",
             "1.0/empty.fit.signed", "1.0/control/fit.crt",
             "1.0/empty.cv2-kernel.sig", "1.0/control/cv2-kernel.pub",
-            "1.0/empty.android-kernel.signed", "1.0/control/android-kernel.crt",
+            "1.0/empty.android-kernel.sig", "1.0/control/android-kernel.x509",
         ]))
         self.assertEqual(0, self.signing_service_client.generate.call_count)
         keys = self.signing_keys
@@ -1770,7 +1770,7 @@ class TestSigningUploadWithSigningService(TestSigningHelpers):
                 '1.0/empty.sipl.sig', '1.0/control/sipl.x509',
                 '1.0/empty.fit.signed', '1.0/control/fit.crt',
                 '1.0/empty.cv2-kernel.sig', '1.0/control/cv2-kernel.pub',
-                '1.0/empty.android-kernel.signed', '1.0/control/android-kernel.crt',
+                '1.0/empty.android-kernel.sig', '1.0/control/android-kernel.x509',
             ], tarball.getnames())
         self.assertEqual(0, self.signing_service_client.generate.call_count)
         keys = self.signing_keys
@@ -1921,13 +1921,13 @@ class TestSigningUploadWithSigningService(TestSigningHelpers):
             "1.0/empty.efi.signed", "1.0/empty.ko.sig",
             "1.0/empty.opal.sig", "1.0/empty.sipl.sig",
             "1.0/empty.fit.signed", "1.0/empty.cv2-kernel.sig",
-            "1.0/empty.android-kernel.signed"]
+            "1.0/empty.android-kernel.sig"]
 
         expected_public_keys_filenames = [
             "1.0/control/uefi.crt", "1.0/control/kmod.x509",
             "1.0/control/opal.x509", "1.0/control/sipl.x509",
             "1.0/control/fit.crt", "1.0/control/cv2-kernel.pub",
-            "1.0/control/android-kernel.crt"]
+            "1.0/control/android-kernel.x509"]
 
         signed_path = self.getSignedPath("test", "amd64")
         self.assertThat(signed_path, SignedMatches(