From 32595e7cb720d4fb56a233f64826c424985a758e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Thu, 11 Apr 2024 09:50:19 +0200 Subject: [PATCH] openpgp: export full key for internal gpg --- system/t04_mirror/UpdateMirror21Test_gold | 15 ++++++--------- system/t04_mirror/update.py | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/system/t04_mirror/UpdateMirror21Test_gold b/system/t04_mirror/UpdateMirror21Test_gold index 6ef582fe..869ec65b 100644 --- a/system/t04_mirror/UpdateMirror21Test_gold +++ b/system/t04_mirror/UpdateMirror21Test_gold @@ -1,16 +1,13 @@ -Downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease... -Error downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease: HTTP code 404 while fetching http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease retrying... +Downloading: http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease +Error (retrying): HTTP code 404 while fetching http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease Retrying 0 http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease... -Giving up on http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease... -Downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release... -Success downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release -Downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release.gpg... -Success downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release.gpg +Download Error: http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/InRelease +Downloading: http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release +Downloading: http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Release.gpg openpgp: RSA key ID AE0396CFF8253540 openpgp: Good signature from "Package Maintainer (PagerDuty, Inc.) " Downloading & parsing package files... -Downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Packages.gz... -Success downloading http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Packages.gz +Downloading: http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent/deb/Packages.gz Building download queue... Download queue: 23 items (3.46 MiB) diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py index b314fec1..41f925e8 100644 --- a/system/t04_mirror/update.py +++ b/system/t04_mirror/update.py @@ -355,7 +355,7 @@ class UpdateMirror20Test(BaseTest): fixtureGpg = True configOverride = {"gpgProvider": "internal"} fixtureCmds = [ - "gpg --no-default-keyring --keyring aptlytest.gpg --export-options export-minimal --export -o " + os.path.join( + "gpg --no-default-keyring --keyring aptlytest.gpg --export -o " + os.path.join( os.environ["HOME"], ".gnupg/aptlytest-gpg1.gpg"), "aptly mirror create --keyring=aptlytest-gpg1.gpg -architectures=amd64 --filter='r-cran-class' flat http://repo.aptly.info/system-tests/cloud.r-project.org/bin/linux/debian bullseye-cran40/", ] @@ -374,7 +374,7 @@ class UpdateMirror21Test(BaseTest): configOverride = {"gpgProvider": "internal", "max-tries": 1} fixtureGpg = True fixtureCmds = [ - "gpg --no-default-keyring --keyring aptlytest.gpg --export-options export-minimal --export -o " + os.path.join( + "gpg --no-default-keyring --keyring aptlytest.gpg --export -o " + os.path.join( os.environ["HOME"], ".gnupg/aptlytest-gpg1.gpg"), "aptly mirror create --keyring=aptlytest-gpg1.gpg pagerduty http://repo.aptly.info/system-tests/packages.pagerduty.com/pdagent deb/" ] @@ -395,7 +395,7 @@ class UpdateMirror22Test(BaseTest): configOverride = {"gpgProvider": "internal"} fixtureGpg = True fixtureCmds = [ - "gpg --no-default-keyring --keyring aptlytest.gpg --export-options export-minimal --export -o " + os.path.join( + "gpg --no-default-keyring --keyring aptlytest.gpg --export -o " + os.path.join( os.environ["HOME"], ".gnupg/aptlytest-gpg1.gpg"), "aptly mirror create --keyring=aptlytest-gpg1.gpg --filter=nomatch libnvidia-container http://repo.aptly.info/system-tests/nvidia.github.io/libnvidia-container/stable/ubuntu16.04/amd64 ./" ]