Merge ~dviererbe/simplestreams:rotate-example-gpg-keys into simplestreams:master

[Dominik Viererbe]

test: rotate example gpg keys

examples/keys/example.pub and examples/keys/example.sec expired on 2023-02-24. (See LP: #2013081)

[Robie Basak (racb)]

Thank you for the fix!

While this will presumably work for the moment, please could we avoid just kicking the can down the road?

For example, with dynamic key generation in the test, or I think we can just set the key not to expire? You could even just edit the existing key and set it not to expire.

review: Needs Fixing

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

FAILED: Continuous integration, rev:d5e71781236fc06896b195b7903bdca7e1af4892
https://jenkins.canonical.com/server-team/job/simplestreams-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-amd64/9/
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-ppc64el/9/
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-s390x/9/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/simplestreams-ci/9//rebuild

review: Needs Fixing (continuous-integration)

[Dominik Viererbe (dviererbe)]

@Robie Basak I changed the key to one that does not expire. I also recommended dynamic key creation in the bug ticket, but I don't want to introduce big delta with lunar lobster release around the corner.

As far as I can tell: The CI Tests does not fail, because of my changes. CI tests were failing before. I tested the change on the lunar lobster version that is currently not building.

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

FAILED: Continuous integration, rev:68414193c3fe27538cec757bafbfe3ce83f0ce80
https://jenkins.canonical.com/server-team/job/simplestreams-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-amd64/10/
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-ppc64el/10/
    FAILURE: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-s390x/10/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/simplestreams-ci/10//rebuild

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

CI fails in master because a MP was merged without waiting for CI results [1], and that introduced changes that made flake8 unhappy. Luckily the issue is fairly trivial:

tools/make-test-data:700:80: E501 line too long (84 > 79 characters)
tools/make-test-data:701:80: E501 line too long (82 > 79 characters)
tools/make-test-data:708:80: E501 line too long (82 > 79 characters)
tools/make-test-data:709:80: E501 line too long (80 > 79 characters)
tools/make-test-data:713:80: E501 line too long (83 > 79 characters)

Given that the CI failure we have here is clearly a linting issue I'm +1 with manually merging this MP, and then fix linting in a separate MP. (We could fix linting first, but we'd hit the key expiration issue, which is less obvious.)

I have a branch where I applied black and isort to master [2]. If we agree on that approach let's land it soon after this one.

[1] https://code.launchpad.net/~toabctl/simplestreams/+git/simplestreams/+merge/437132
[2] https://code.launchpad.net/~paride/simplestreams/+git/simplestreams/+ref/apply-black

review: Approve

diff --git a/examples/keys/example.pub b/examples/keys/example.pub
index a0d4f86..cb984eb 100644
--- a/examples/keys/example.pub
+++ b/examples/keys/example.pub
@@ -1,14 +1,14 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
 
-mI0EUSw66gEEAM6AjeB/KtvuLbkbn6F0Whew2sYx5O2j2smSgwJ0oevnlRzneyXh
-kUIR+wH5KBDIz5Ikp35ZrZFYoP++7VMALDTp9l+OOlrbz4rQzwI8HvXumkhT+BgE
-lfN10eu0rBkVNxqt9lXuMNYwgJJtfBPzXVBQju6QDYx5Uodxk9C9TXapABEBAAG0
+mI0EZCL9pgEEALjMscvUXnyoFeP9McF+0yW4SFQsl8WwpXosSae3DSInIJSoEOG7
+HBewSS3dOK0lHIYnDZLtA0kSuC/a43mzgRLnY2paGKRL/cC/M2z66Dib83kZgOG8
+phVZH2HEMJxhb9XLibfTeIUvSgYLSnE4a00xLmlUjI11mCk36RYh4xhhABEBAAG0
 XFNpbXBsZSBTdHJlYW1zIFRlc3QgVXNlciAoVGVzdCBVc2FnZSBPbmx5LiBEbyBO
-b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iL4E
-EwECACgFAlEsOuoCGy8FCRLMAwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
-EKlxSiA5Z1NuK0ID/R8iBwVt/9tqFy7eeJzCDK0O7QcpmhvKyjPLLmsUhysx8kC7
-S89yuWyr6iQcjAoAMK6EkOZgRoFfOIA+hZkFC0blFHLCrdSghSQQm6hL/XJuWtkf
-HBdu7yKudGzGyYmpGYYG69zz+he5EZUtY1fR9PSGSM+ZwCLznHdCJix7bNi0
-=HEJL
+b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iM4E
+EwEKADgWIQQkk5C2cpQTdyB9ZpY4cK3qoW5CfAUCZCL9pgIbLwULCQgHAgYVCgkI
+CwIEFgIDAQIeAQIXgAAKCRA4cK3qoW5CfP9KBACxeVNSRzLHOLvthMxvqoqB/775
+AmJOPH2OiEfQOAr9C04zcW4FseBDXTS+6vydk5WsG3M7QA7p+zPiKy1atXhUOHY1
+VySd2AAB0u2RWUAWgg2DaQfbzfuxztqGBqlxPsGXgpobvumXf2pNehoBH9J9T4W4
+8NH75blul5zZaFvkmA==
+=C/S4
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/examples/keys/example.sec b/examples/keys/example.sec
index 0e5add1..6108d82 100644
--- a/examples/keys/example.sec
+++ b/examples/keys/example.sec
@@ -1,21 +1,21 @@
 -----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
 
-lQHXBFEsOuoBBADOgI3gfyrb7i25G5+hdFoXsNrGMeTto9rJkoMCdKHr55Uc53sl
-4ZFCEfsB+SgQyM+SJKd+Wa2RWKD/vu1TACw06fZfjjpa28+K0M8CPB717ppIU/gY
-BJXzddHrtKwZFTcarfZV7jDWMICSbXwT811QUI7ukA2MeVKHcZPQvU12qQARAQAB
-AAP2KSNzIEY1Q5svgLEAHCoRyKZy7wkBklYSQBXwA404tMZt7lQvNFy7k24Bk2MP
-mEhpEbQ7qfAzo8EEUe63WNGv/H6yl37pcS2rKxGdar9/dFV2t/TbJaehKotIvG9D
-x1CvuT/7DQRj9rGWrDrhx2XIz8hpD21bxrDb2TEF5WjfAQIA05tN+7zxTXSKq7Wt
-215ba4kBhKKuvrYMN5m871O/cNJfVh9ABea4xRFOOTkcpXsHAl1JPV52wRlHpBoe
-b36goQIA+dMapApF9zYflJ5rp3RLCwH0YwmY55+MBL5OTN7PM6DFs61rQG1ZO3x8
-VJ1GNvpVhEuIBUmsD2O4BVYekDsxCQIAuqMgVMVDfj7P2MeMKZ888XphQuYeJdIq
-IckpdKnZSKSU0oXKiB9y0AyptB1Aih8IhF00EIURWjMI//19JkBXuJNetFxTaW1w
-bGUgU3RyZWFtcyBUZXN0IFVzZXIgKFRlc3QgVXNhZ2UgT25seS4gRG8gTm90IElt
-cG9ydC4pIDxzaW1wbGVzdHJlYW1zQGJvZ3VzLmV4YW1wbGUuY29tPoi+BBMBAgAo
-BQJRLDrqAhsvBQkSzAMABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCpcUog
-OWdTbitCA/0fIgcFbf/bahcu3nicwgytDu0HKZobysozyy5rFIcrMfJAu0vPcrls
-q+okHIwKADCuhJDmYEaBXziAPoWZBQtG5RRywq3UoIUkEJuoS/1yblrZHxwXbu8i
-rnRsxsmJqRmGBuvc8/oXuRGVLWNX0fT0hkjPmcAi85x3QiYse2zYtA==
-=svaP
+lQHYBGQi/aYBBAC4zLHL1F58qBXj/THBftMluEhULJfFsKV6LEmntw0iJyCUqBDh
+uxwXsEkt3TitJRyGJw2S7QNJErgv2uN5s4ES52NqWhikS/3AvzNs+ug4m/N5GYDh
+vKYVWR9hxDCcYW/Vy4m303iFL0oGC0pxOGtNMS5pVIyNdZgpN+kWIeMYYQARAQAB
+AAP9HOQzr9BF7WtB8OD21G+Fh1ImTLKkD84sMMuXwFbIANzpJRSZfxEHtVRkPH1n
+jPpOWVLltmDDsLryfNjV04MS3KOtCHnfM9poK+CdlLcrH6pg5QyATgktAQZdR6qA
+fWZY7aKoO43bWkpj7iKg1F/eGNA//WJehZLRyZzZSQ/cvyECANFfzcJ/BlFOVrho
+9s92JjGQDLVjYjrgSyGhqQr1NZptpBWbCXyaSPqCJJ+ulRz/W7/JKF1RBHdaw0Ug
++sjcB3UCAOHz6sYUs60hSlNPQCH0hk9j4y/DFm51O2qNtiFqxrNDDn3eVdbFPwLN
+9r5vqR6bpe2z3eoxSuVe0V6Ylj8/W70CAI4ecsC4cBJkT83yiqWuNwndGZ1zt8+q
+12THqYUZ6KSBRHrCYOt8LT5QKFzvAzAJ6oNwYk+DMbMX24mpYo+0eQ6gxbRcU2lt
+cGxlIFN0cmVhbXMgVGVzdCBVc2VyIChUZXN0IFVzYWdlIE9ubHkuIERvIE5vdCBJ
+bXBvcnQuKSA8c2ltcGxlc3RyZWFtc0Bib2d1cy5leGFtcGxlLmNvbT6IzgQTAQoA
+OBYhBCSTkLZylBN3IH1mljhwreqhbkJ8BQJkIv2mAhsvBQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEDhwreqhbkJ8/0oEALF5U1JHMsc4u+2EzG+qioH/vvkCYk48
+fY6IR9A4Cv0LTjNxbgWx4ENdNL7q/J2TlawbcztADun7M+IrLVq1eFQ4djVXJJ3Y
+AAHS7ZFZQBaCDYNpB9vN+7HO2oYGqXE+wZeCmhu+6Zd/ak16GgEf0n1Phbjw0fvl
+uW6XnNloW+SY
+=uILn
 -----END PGP PRIVATE KEY BLOCK-----