From 88e250eff751b50da2e113ff0ce33092e1d81048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <45594031+dcermak@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:21:10 +0200 Subject: [PATCH 1/3] Bump required go version to 1.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Podman fails to build with go 1.13 with: ``` vendor/golang.org/x/net/http2/transport.go:417:45: undefined: os.ErrDeadlineExceeded ``` Updating go to 1.15 fixes this issue. [NO NEW TESTS NEEDED] Signed-off-by: Dan Čermák --- go.mod | 2 +- vendor/modules.txt | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f9691b1060..cf61594e4a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containers/podman/v3 -go 1.13 +go 1.15 require ( github.com/BurntSushi/toml v0.4.1 diff --git a/vendor/modules.txt b/vendor/modules.txt index e7037478ae..383c464e20 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,6 +2,7 @@ github.com/Azure/go-ansiterm github.com/Azure/go-ansiterm/winterm # github.com/BurntSushi/toml v0.4.1 +## explicit github.com/BurntSushi/toml github.com/BurntSushi/toml/internal # github.com/Microsoft/go-winio v0.5.0 @@ -38,19 +39,24 @@ github.com/acarl005/stripansi # github.com/beorn7/perks v1.0.1 github.com/beorn7/perks/quantile # github.com/blang/semver v3.5.1+incompatible +## explicit github.com/blang/semver # github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37 +## explicit github.com/buger/goterm # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 # github.com/checkpoint-restore/checkpointctl v0.0.0-20210301084134-a2024f5584e7 +## explicit github.com/checkpoint-restore/checkpointctl/lib # github.com/checkpoint-restore/go-criu/v5 v5.1.0 +## explicit github.com/checkpoint-restore/go-criu/v5 github.com/checkpoint-restore/go-criu/v5/rpc # github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e github.com/chzyer/readline # github.com/container-orchestrated-devices/container-device-interface v0.0.0-20210325223243-f99e8b6c10b9 +## explicit github.com/container-orchestrated-devices/container-device-interface/pkg github.com/container-orchestrated-devices/container-device-interface/specs-go # github.com/containerd/cgroups v1.0.1 @@ -65,6 +71,7 @@ github.com/containerd/containerd/sys github.com/containerd/stargz-snapshotter/estargz github.com/containerd/stargz-snapshotter/estargz/errorutil # github.com/containernetworking/cni v0.8.1 +## explicit github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke github.com/containernetworking/cni/pkg/types @@ -73,6 +80,7 @@ github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v0.9.1 +## explicit github.com/containernetworking/plugins/pkg/ip github.com/containernetworking/plugins/pkg/ns github.com/containernetworking/plugins/pkg/utils/hwaddr @@ -80,6 +88,7 @@ github.com/containernetworking/plugins/pkg/utils/sysctl github.com/containernetworking/plugins/plugins/ipam/host-local/backend github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator # github.com/containers/buildah v1.23.1 +## explicit github.com/containers/buildah github.com/containers/buildah/bind github.com/containers/buildah/chroot @@ -98,6 +107,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/util # github.com/containers/common v0.44.5 +## explicit github.com/containers/common/libimage github.com/containers/common/libimage/manifests github.com/containers/common/pkg/apparmor @@ -129,8 +139,10 @@ github.com/containers/common/pkg/timetype github.com/containers/common/pkg/umask github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible +## explicit github.com/containers/conmon/runner/config # github.com/containers/image/v5 v5.17.0 +## explicit github.com/containers/image/v5/copy github.com/containers/image/v5/directory github.com/containers/image/v5/directory/explicitfilepath @@ -180,6 +192,7 @@ github.com/containers/image/v5/version # github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b github.com/containers/libtrust # github.com/containers/ocicrypt v1.1.2 +## explicit github.com/containers/ocicrypt github.com/containers/ocicrypt/blockcipher github.com/containers/ocicrypt/config @@ -197,6 +210,7 @@ github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider # github.com/containers/psgo v1.7.2-0.20220414132323-3ae304491648 +## explicit github.com/containers/psgo github.com/containers/psgo/internal/capabilities github.com/containers/psgo/internal/cgroups @@ -205,6 +219,7 @@ github.com/containers/psgo/internal/host github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process # github.com/containers/storage v1.37.2 +## explicit github.com/containers/storage github.com/containers/storage/drivers github.com/containers/storage/drivers/aufs @@ -254,6 +269,7 @@ github.com/coreos/go-iptables/iptables # github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/coreos/go-systemd/activation # github.com/coreos/go-systemd/v22 v22.3.2 +## explicit github.com/coreos/go-systemd/v22/activation github.com/coreos/go-systemd/v22/daemon github.com/coreos/go-systemd/v22/dbus @@ -261,15 +277,19 @@ github.com/coreos/go-systemd/v22/internal/dlopen github.com/coreos/go-systemd/v22/journal github.com/coreos/go-systemd/v22/sdjournal # github.com/coreos/stream-metadata-go v0.0.0-20210225230131-70edb9eb47b3 +## explicit github.com/coreos/stream-metadata-go/fedoracoreos github.com/coreos/stream-metadata-go/fedoracoreos/internals github.com/coreos/stream-metadata-go/stream github.com/coreos/stream-metadata-go/stream/rhcos # github.com/cri-o/ocicni v0.2.1-0.20210621164014-d0acc7862283 +## explicit github.com/cri-o/ocicni/pkg/ocicni # github.com/cyphar/filepath-securejoin v0.2.3 +## explicit github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 +## explicit github.com/davecgh/go-spew/spew # github.com/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1 github.com/digitalocean/go-libvirt @@ -277,10 +297,12 @@ github.com/digitalocean/go-libvirt/internal/constants github.com/digitalocean/go-libvirt/internal/event github.com/digitalocean/go-libvirt/internal/go-xdr/xdr2 # github.com/digitalocean/go-qemu v0.0.0-20210209191958-152a1535e49f +## explicit github.com/digitalocean/go-qemu/qmp # github.com/disiqueira/gotree/v3 v3.0.2 github.com/disiqueira/gotree/v3 # github.com/docker/distribution v2.7.1+incompatible +## explicit github.com/docker/distribution github.com/docker/distribution/digestset github.com/docker/distribution/metrics @@ -293,6 +315,7 @@ github.com/docker/distribution/registry/client/transport github.com/docker/distribution/registry/storage/cache github.com/docker/distribution/registry/storage/cache/memory # github.com/docker/docker v20.10.11+incompatible +## explicit github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/blkiodev @@ -327,33 +350,40 @@ github.com/docker/docker/pkg/system github.com/docker/docker-credential-helpers/client github.com/docker/docker-credential-helpers/credentials # github.com/docker/go-connections v0.4.0 +## explicit github.com/docker/go-connections/nat github.com/docker/go-connections/sockets github.com/docker/go-connections/tlsconfig # github.com/docker/go-metrics v0.0.1 github.com/docker/go-metrics # github.com/docker/go-plugins-helpers v0.0.0-20200102110956-c9a8a2d92ccc +## explicit github.com/docker/go-plugins-helpers/sdk github.com/docker/go-plugins-helpers/volume # github.com/docker/go-units v0.4.0 +## explicit github.com/docker/go-units # github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316 github.com/docker/libnetwork/resolvconf github.com/docker/libnetwork/resolvconf/dns github.com/docker/libnetwork/types # github.com/dtylman/scp v0.0.0-20181017070807-f3000a34aef4 +## explicit github.com/dtylman/scp # github.com/fsnotify/fsnotify v1.5.1 +## explicit github.com/fsnotify/fsnotify # github.com/fsouza/go-dockerclient v1.7.4 github.com/fsouza/go-dockerclient # github.com/ghodss/yaml v1.0.0 +## explicit github.com/ghodss/yaml # github.com/go-logr/logr v0.4.0 github.com/go-logr/logr # github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 github.com/go-task/slim-sprig # github.com/godbus/dbus/v5 v5.0.6 +## explicit github.com/godbus/dbus/v5 # github.com/gogo/protobuf v1.3.2 github.com/gogo/protobuf/gogoproto @@ -379,20 +409,27 @@ github.com/google/go-intervals/intervalset # github.com/google/gofuzz v1.1.0 github.com/google/gofuzz # github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf +## explicit github.com/google/shlex # github.com/google/uuid v1.3.0 +## explicit github.com/google/uuid # github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33 +## explicit github.com/gorilla/handlers # github.com/gorilla/mux v1.8.0 +## explicit github.com/gorilla/mux # github.com/gorilla/schema v1.2.0 +## explicit github.com/gorilla/schema # github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap # github.com/hashicorp/go-multierror v1.1.1 +## explicit github.com/hashicorp/go-multierror # github.com/hpcloud/tail v1.0.0 +## explicit github.com/hpcloud/tail github.com/hpcloud/tail/ratelimiter github.com/hpcloud/tail/util @@ -407,6 +444,7 @@ github.com/ishidawataru/sctp # github.com/jinzhu/copier v0.3.2 github.com/jinzhu/copier # github.com/json-iterator/go v1.1.12 +## explicit github.com/json-iterator/go # github.com/klauspost/compress v1.13.6 github.com/klauspost/compress @@ -439,6 +477,7 @@ github.com/moby/sys/mount # github.com/moby/sys/mountinfo v0.4.1 github.com/moby/sys/mountinfo # github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 +## explicit github.com/moby/term github.com/moby/term/windows # github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd @@ -448,6 +487,7 @@ github.com/modern-go/reflect2 # github.com/morikuni/aec v1.0.0 github.com/morikuni/aec # github.com/mrunalp/fileutils v0.5.0 +## explicit github.com/mrunalp/fileutils # github.com/mtrmac/gpgme v0.1.2 github.com/mtrmac/gpgme @@ -458,6 +498,7 @@ github.com/nxadm/tail/util github.com/nxadm/tail/watch github.com/nxadm/tail/winfile # github.com/onsi/ginkgo v1.16.4 +## explicit github.com/onsi/ginkgo github.com/onsi/ginkgo/config github.com/onsi/ginkgo/extensions/table @@ -488,6 +529,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types # github.com/onsi/gomega v1.16.0 +## explicit github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/gbytes @@ -502,11 +544,14 @@ github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types # github.com/opencontainers/go-digest v1.0.0 +## explicit github.com/opencontainers/go-digest # github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283 +## explicit github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 # github.com/opencontainers/runc v1.0.2 +## explicit github.com/opencontainers/runc/libcontainer/apparmor github.com/opencontainers/runc/libcontainer/cgroups github.com/opencontainers/runc/libcontainer/configs @@ -515,8 +560,10 @@ github.com/opencontainers/runc/libcontainer/user github.com/opencontainers/runc/libcontainer/userns github.com/opencontainers/runc/libcontainer/utils # github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 +## explicit github.com/opencontainers/runtime-spec/specs-go # github.com/opencontainers/runtime-tools v0.9.0 +## explicit github.com/opencontainers/runtime-tools/error github.com/opencontainers/runtime-tools/filepath github.com/opencontainers/runtime-tools/generate @@ -524,6 +571,7 @@ github.com/opencontainers/runtime-tools/generate/seccomp github.com/opencontainers/runtime-tools/specerror github.com/opencontainers/runtime-tools/validate # github.com/opencontainers/selinux v1.9.1 +## explicit github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalk @@ -538,10 +586,13 @@ github.com/openshift/imagebuilder/strslice github.com/ostreedev/ostree-go/pkg/glibobject github.com/ostreedev/ostree-go/pkg/otbuiltin # github.com/pkg/errors v0.9.1 +## explicit github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 +## explicit github.com/pmezard/go-difflib/difflib # github.com/prometheus/client_golang v1.11.1 +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp @@ -558,6 +609,7 @@ github.com/prometheus/procfs/internal/util # github.com/rivo/uniseg v0.2.0 github.com/rivo/uniseg # github.com/rootless-containers/rootlesskit v0.14.5 +## explicit github.com/rootless-containers/rootlesskit/pkg/api github.com/rootless-containers/rootlesskit/pkg/msgutil github.com/rootless-containers/rootlesskit/pkg/port @@ -575,22 +627,28 @@ github.com/safchain/ethtool # github.com/seccomp/libseccomp-golang v0.9.2-0.20200616122406-847368b35ebf github.com/seccomp/libseccomp-golang # github.com/sirupsen/logrus v1.8.1 +## explicit github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog # github.com/spf13/cobra v1.2.1 +## explicit github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 github.com/stefanberger/go-pkcs11uri # github.com/stretchr/testify v1.7.0 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/require # github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +## explicit github.com/syndtr/gocapability/capability # github.com/tchap/go-patricia v2.3.0+incompatible github.com/tchap/go-patricia/patricia # github.com/uber/jaeger-client-go v2.29.1+incompatible +## explicit github.com/uber/jaeger-client-go/log github.com/uber/jaeger-client-go/thrift github.com/uber/jaeger-client-go/thrift-gen/agent @@ -607,6 +665,7 @@ github.com/vbatts/tar-split/archive/tar github.com/vbatts/tar-split/tar/asm github.com/vbatts/tar-split/tar/storage # github.com/vbauerster/mpb/v6 v6.0.4 +## explicit github.com/vbauerster/mpb/v6 github.com/vbauerster/mpb/v6/cwriter github.com/vbauerster/mpb/v6/decor @@ -617,6 +676,7 @@ github.com/vbauerster/mpb/v7/cwriter github.com/vbauerster/mpb/v7/decor github.com/vbauerster/mpb/v7/internal # github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 +## explicit github.com/vishvananda/netlink github.com/vishvananda/netlink/nl # github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae @@ -628,6 +688,7 @@ github.com/xeipuuv/gojsonreference # github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeipuuv/gojsonschema # go.etcd.io/bbolt v1.3.6 +## explicit go.etcd.io/bbolt # go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 go.mozilla.org/pkcs7 @@ -638,6 +699,7 @@ go.opencensus.io/trace go.opencensus.io/trace/internal go.opencensus.io/trace/tracestate # golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 +## explicit golang.org/x/crypto/blowfish golang.org/x/crypto/cast5 golang.org/x/crypto/chacha20 @@ -672,9 +734,11 @@ golang.org/x/net/internal/timeseries golang.org/x/net/proxy golang.org/x/net/trace # golang.org/x/sync v0.0.0-20210220032951-036812b2e83c +## explicit golang.org/x/sync/errgroup golang.org/x/sync/semaphore # golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 +## explicit golang.org/x/sys/cpu golang.org/x/sys/execabs golang.org/x/sys/internal/unsafeheader @@ -798,11 +862,14 @@ gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b +## explicit gopkg.in/yaml.v3 # k8s.io/api v0.22.1 +## explicit k8s.io/api/apps/v1 k8s.io/api/core/v1 # k8s.io/apimachinery v0.22.1 +## explicit k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/conversion From b384f9f0bc799300b592e4fb07c835a427328aef Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 2 Aug 2022 09:42:29 +0200 Subject: [PATCH 2/3] e2e: pull_test: speed up --all-tags Pulling the K8s pause image seems unnecessarily expensive to me. Let's use the testgitest_v2s2 one which is under our control and weighs only a couple of KB. This cut the execution time in less than half on my machine. Since it's network bound and I am running on fibre, I expect more significant speed ups in slower networks. Also fixes CI since the K8s pause image changed and broke the test. Signed-off-by: Valentin Rothberg (cherry picked from commit 09ce748ee88548d97947d45f3b834c97f26dcb8f) --- test/e2e/pull_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index c377f158d1..73ef11bf9b 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -400,14 +400,14 @@ var _ = Describe("Podman pull", func() { }) It("podman pull check all tags", func() { - session := podmanTest.Podman([]string{"pull", "--all-tags", "k8s.gcr.io/pause"}) + session := podmanTest.Podman([]string{"pull", "--all-tags", "quay.io/libpod/testdigest_v2s2"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"images"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 4)) + Expect(len(session.OutputToStringArray())).To(BeNumerically(">=", 2), "Expected at least two images") }) It("podman pull from docker with nonexistent --authfile", func() { From 28207391aa2882f889e96c33f49f71970a5d6359 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 1 Aug 2022 14:58:28 +0200 Subject: [PATCH 3/3] fix e2e sign tests The key used in the tests has expired. Remove the expiration date to turn CI happy and green. Signed-off-by: Valentin Rothberg (cherry picked from commit de3d34b7014cca69b534b4732dd1bbf09e7dedc0) --- test/e2e/sign/key.gpg | Bin 1745 -> 1565 bytes test/e2e/sign/secret-key.asc | Bin 3510 -> 2867 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/e2e/sign/key.gpg b/test/e2e/sign/key.gpg index 32968fc04b9fb20f95b67c9acebb82278d264124..725bdfb7d0a1c2ff52344a67a34f8bc904e55940 100644 GIT binary patch literal 1565 zcmaizc{mdc9LKjAHb+=^9mV#x(3o6}YFH>Wa+KqJb1ddujc9ru%Na4|K9VabF$qay zh#}W7U4%j=iS#HrCdXU7&-=Xn)ARoI`#!%vKhNir3ls+vkeItb2;f0iU|G!D+hVVF znKOpq+d?TG>zWTR+aanJaM^wX(8lDE*;$I32-3O!^J2m4cyfpDKJrdxg`EGGhsFjy zu`dzObE2Kj!%kgFBqhgT2d(KLl9LcLoUvYd)qDXN|58tC$wHw*URsMQWVimYaKIM( z)!e`OFJU52sz|2CglYM#M#6|ioiWKzRWr>jAa{ELH>0M4?Nko>ge$`2OI;G(S!b(O|b zqYooP`Q#~`=lfnlZ!%$deYLBq0db>fb;Zm&UNz<}f9WJoE_Mt%Jdv=ozF*7eaT*~b z0BYsns?|M>&@*wSKdKNYmJTbryLA1yjMk~{CFrdJeWJNVP)FRYJKh&OdPgF{WA}$D z5@L z4q|+T@vA!3gx?kJCS5HX!*^>6hYqLa}U<3 zIM3XilIkX{0F;vtu%~cGYtdRFt0bx_ZMV%1NA1v33fuIa0i_|Q_ILM7Qg<}B6cK`B zOhmGwY8H2xon5JFm%rHLF2WZ6Vhva$d*yonj@104GK4|MT zkYBTo7`UPF4yQ=*A;B>tg3)`>ue0O%jDna>3sDe<(N@SJ*mOA*_AOkVkH@3TmH5v=s-a?Od;=$GSeTaS$A zM+G9%N~jtEYwC_+R1t&_n{=G6oTJ^fXLm*T%jQ0)lS?bOvZ0f|shojRD7Wejwb!3n z<5GuN4&l?B;%10uiIbIh>O)gK8;rvIZnw=dx+X(mJIHUm&M>B4$ii0Vs$6$7;D=XV z87j}Qz9>;ckr^|5o^xeu`{kT9gYgGrB8z(}ab0aFC;2AB7d{wQ%y@uYw6jk3rT(Ph zlp}X!bcy-qvV(kPR=TA1({%i2d0iE2Y39Re`7f(v$fpWDU6vJh^xE{%XICcpG0>>5 KtBCWKA%6qBaL#`K literal 1745 zcma)-$F8Jm5`_0WMek7yPr;%WKOPEi3bVueqVNSzKj*eay1UWjHldW!KcPPh2yKil6BG&-WmNlb6fC&vRG{SwcqhQmQH&)lV#P_-Gk z!+ly`92_C~w|9Z?_G=!oIF7a&6ncWGkM!FCT{LpLx$W!k}T>B?lZ5D{Uz`qZLxHFS_87%#H;d41XQ% zLBGh}tVB(l3B$v4C|{G0Mc~AiD;qJD*}NvaDh^Hb*k30tgOWe7Z6wVkTFDx_R368y z3TbY;^T`ZXGG$IOE3&086bXx|dI;`9s&+jJwJ-o6|`F7j5I2DuLmzYrK3K z62v<;pPWGA&tBzDRhFDd
vT+D-0?wx-{p4(p6pgt%PLL}y_TX;8? zO0KVAo+b@k6YKoP?SXdJuooNUUsei$K z?hMvzAkWKk8dKErE~6Jfi$O`jD?@!$$>+SwHnfk15>Sj5dXanb=UKdS*?-~@3pXB1 z%NQ)#$i_6TDrCbPC>!TSC1Kq+eS7m~-Z3Eqj%Prby6EvYs@{oc!prm{*K>m7R+^Bm zz^TDIKXg3_l%&@}!R}LH%CA*>z{oHz(FHolCj@eN1O_>!I%gTr?ns}WaAJE%&GG1e z-|uyn1QoR?IMTiXhM==p(E~mOpSP+PU+A^$70yWeagEt}HA20@1~(};+Ua3vD?x}) zp{~yPkxD36+72drbTB2un3UbBpC^=ipDYE6_O2h`jkNkcTiim4MF6PCh~}{{Bw^_q zbWh4#9W`7`^Brl{hAVbLjY$^LsK~|`Ib6IVc-#0RKZwn0TehS0YG532@Fv3^JO=CW=}<{;Z_v& zi!asIvNssACo2L%33_HrC7o&usdC#z=KXNWN}2i|&L|SQw$u3e2dPP7 z@iYDa-4Y1O*?uxe&Q2B!Ydq?*GIv`(5}skP;s!>t+~*tIG4)lXO`tX^^h6Qy`hK}& z-}uR>M{N5K&a7Q*ye%)LVA1}Hq@(3ZDCt*lY-n|L5Nh}}O6SiX=+E^NCg^V+iKg&B Gy6Qh=$TFh< diff --git a/test/e2e/sign/secret-key.asc b/test/e2e/sign/secret-key.asc index 23c0d05c32be9bd5b6885720a57d534bf42c5300..f018a3ce53ed986597a0beccf5fb9097476e9215 100644 GIT binary patch literal 2867 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