Skip to content

Commit cba2164

Browse files
committed
Update CI images
... from containers/automation_images#416 That requires updating tests to also work with rust-podman-sequoia 0.2.0: ueno/podman-sequoia@d41fefa changed how the error is reported. Signed-off-by: Miloslav Trmač <[email protected]>
1 parent b258da2 commit cba2164

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
SCRIPT_BASE: "./contrib/cirrus"
2222

2323
# Google-cloud VM Images
24-
IMAGE_SUFFIX: "c20250721t181111z-f42f41d13"
24+
IMAGE_SUFFIX: "c20250910t092246z-f42f41d13"
2525
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
2626

2727
# Container FQIN's

integration/copy_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,10 @@ func (s *copySuite) TestCopySignatures() {
776776
// Verify that mis-signed images are rejected
777777
assertSkopeoSucceeds(t, "", "--tls-verify=false", "copy", "atomic:localhost:5006/myns/personal:personal", "atomic:localhost:5006/myns/official:attack")
778778
assertSkopeoSucceeds(t, "", "--tls-verify=false", "copy", "atomic:localhost:5006/myns/official:official", "atomic:localhost:5006/myns/personal:attack")
779-
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|.* was not found).*",
779+
// "Invalid GPG signature" is reported by the gpgme mechanism; "Missing key: $fingerprint" by Sequoia.
780+
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|Missing key:).*",
780781
"--tls-verify=false", "--policy", policy, "copy", "atomic:localhost:5006/myns/personal:attack", dirDest)
781-
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|.* was not found).*",
782+
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|Missing key:).*",
782783
"--tls-verify=false", "--policy", policy, "copy", "atomic:localhost:5006/myns/official:attack", dirDest)
783784

784785
// Verify that signed identity is verified.
@@ -791,7 +792,8 @@ func (s *copySuite) TestCopySignatures() {
791792

792793
// Verify that cosigning requirements are enforced
793794
assertSkopeoSucceeds(t, "", "--tls-verify=false", "copy", "atomic:localhost:5006/myns/official:official", "atomic:localhost:5006/myns/cosigned:cosigned")
794-
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|.* was not found).*",
795+
// "Invalid GPG signature" is reported by the gpgme mechanism; "Missing key: $fingerprint" by Sequoia.
796+
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|Missing key:).*",
795797
"--tls-verify=false", "--policy", policy, "copy", "atomic:localhost:5006/myns/cosigned:cosigned", dirDest)
796798

797799
assertSkopeoSucceeds(t, "", "--tls-verify=false", "copy", "--sign-by", "[email protected]", "atomic:localhost:5006/myns/official:official", "atomic:localhost:5006/myns/cosigned:cosigned")
@@ -836,7 +838,8 @@ func (s *copySuite) TestCopyDirSignatures() {
836838
// Verify that correct images are accepted
837839
assertSkopeoSucceeds(t, "", "--policy", policy, "copy", topDirDest+"/restricted/official", topDirDest+"/dest")
838840
// ... and that mis-signed images are rejected.
839-
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|.* was not found).*",
841+
// "Invalid GPG signature" is reported by the gpgme mechanism; "Missing key: $fingerprint" by Sequoia.
842+
assertSkopeoFails(t, ".*Source image rejected: (Invalid GPG signature|Missing key:).*",
840843
"--policy", policy, "copy", topDirDest+"/restricted/personal", topDirDest+"/dest")
841844

842845
// Verify that the signed identity is verified.

systemtest/050-signing.bats

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ END_PUSH
136136
# Done pushing. Now try to fetch. From here on we use the --policy option.
137137
# The table below lists the paths to fetch, and the expected errors (or
138138
# none, if we expect them to pass).
139+
#
140+
# "Invalid GPG signature" is reported by the gpgme mechanism; "Missing key: $fingerprint" by Sequoia.
139141
while read path expected_error; do
140142
expected_rc=
141143
if [[ -n $expected_error ]]; then
@@ -154,7 +156,7 @@ END_PUSH
154156
fi
155157
done <<END_TESTS
156158
/myns/alice:signed
157-
/myns/bob:signedbyalice (Invalid GPG signature|.* not found)
159+
/myns/bob:signedbyalice (Invalid GPG signature|Missing key:)
158160
/myns/alice:unsigned Signature for identity \\\\\\\\"localhost:5000/myns/alice:signed\\\\\\\\" is not accepted
159161
/myns/carol:latest Running image docker://localhost:5000/myns/carol:latest is rejected by policy.
160162
/open/forall:latest

0 commit comments

Comments
 (0)