system tests: fix expired ppa mirror key

aptly-dev · Jul 31, 2024 · a0bd32a · a0bd32a
1 parent 0b3dd27
commit a0bd32a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/system/t04_mirror/CreateMirror18Test_gold b/system/t04_mirror/CreateMirror18Test_gold
@@ -1,12 +1,10 @@
 Downloading: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/InRelease
-Error (retrying): HTTP code 404 while fetching http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/InRelease
-Retrying 0 http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/InRelease...
-Download Error: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/InRelease
-Downloading: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/Release
-Downloading: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/dists/maverick/Release.gpg
-gpgv: can't allocate lock for '/home/runner/.gnupg/aptlytest.gpg'
-gpgv: Signature made Mon Oct 22 13:19:50 2012 UTC
-gpgv:                using RSA key A5279A973B1F56C0
+gpgv: can't allocate lock for '/home/runner/.gnupg/ppa.gpg'
+gpgv: Signature made Sun Jul 28 07:57:01 2024 UTC
+gpgv:                using RSA key 5BFCD481D86D5824470E469F9000B1C3A01F726C
+gpgv: Good signature from "Launchpad PPA for Anton Gladky"
+gpgv: Signature made Sun Jul 28 07:57:01 2024 UTC
+gpgv:                using RSA key 02219381E9161C78A46CB2BFA5279A973B1F56C0
 gpgv: Good signature from "Launchpad sim"
 
 Mirror [mirror18]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick successfully added.

diff --git a/system/t04_mirror/CreateMirror18Test_mirror_show b/system/t04_mirror/CreateMirror18Test_mirror_show
@@ -11,7 +11,7 @@ Information from release file:
 Architectures: amd64 armel i386 powerpc
 Codename: maverick
 Components: main
-Date: Mon, 22 Oct 2012 13:19:50 UTC
+Date: Sun, 28 Jul 2024  7:57:00 UTC
 Description:  Ubuntu Maverick 10.10
 
 Label: gnuplot

diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py
@@ -222,7 +222,10 @@ class CreateMirror18Test(BaseTest):
         "ppaCodename": "maverick",
     }
 
-    runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror18 ppa:gladky-anton/gnuplot"
+    fixtureCmds = [
+        "gpg --no-default-keyring --keyring=ppa.gpg --keyserver=hkp://keyserver.ubuntu.com:80 --recv-keys 5BFCD481D86D5824470E469F9000B1C3A01F726C 02219381E9161C78A46CB2BFA5279A973B1F56C0"
+    ]
+    runCmd = "aptly mirror create -keyring=ppa.gpg mirror18 ppa:gladky-anton/gnuplot"
 
     def outputMatchPrepare(self, s):
         return re.sub(r'Signature made .* using', '', s)