Skip to content

Commit afeac6e

Browse files
committed
ci: add back dpkg-signed tests
Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
1 parent 666ef77 commit afeac6e

File tree

3 files changed

+47
-18
lines changed

3 files changed

+47
-18
lines changed

acceptance_test.go

+23-18
Original file line numberDiff line numberDiff line change
@@ -318,25 +318,30 @@ func TestRPMSign(t *testing.T) {
318318
func TestDebSign(t *testing.T) {
319319
t.Parallel()
320320
for _, arch := range formatArchs["deb"] {
321-
func(t *testing.T, testArch string) {
322-
t.Run(fmt.Sprintf("deb/%s", testArch), func(t *testing.T) {
323-
t.Parallel()
324-
target := "signed"
325-
if testArch == "ppc64le" && os.Getenv("NO_TEST_PPC64LE") == "true" {
326-
t.Skip("ppc64le arch not supported in pipeline")
327-
}
328-
accept(t, acceptParms{
329-
Name: "debsign_sign_" + testArch,
330-
Conf: "deb.debsign.sign.yaml",
331-
Format: "deb",
332-
Docker: dockerParams{
333-
File: "deb.dockerfile",
334-
Target: target,
335-
Arch: testArch,
336-
},
321+
for _, sigtype := range []string{"dpkg-sig", "debsign"} {
322+
func(t *testing.T, testSigtype, testArch string) {
323+
t.Run(fmt.Sprintf("deb/%s/%s", testArch, testSigtype), func(t *testing.T) {
324+
t.Parallel()
325+
target := "signed"
326+
if testSigtype == "dpkg-sig" {
327+
target = "dpkg-signed"
328+
}
329+
if testArch == "ppc64le" && os.Getenv("NO_TEST_PPC64LE") == "true" {
330+
t.Skip("ppc64le arch not supported in pipeline")
331+
}
332+
accept(t, acceptParms{
333+
Name: fmt.Sprintf("%s_sign_%s", testSigtype, testArch),
334+
Conf: fmt.Sprintf("deb.%s.sign.yaml", testSigtype),
335+
Format: "deb",
336+
Docker: dockerParams{
337+
File: "deb.dockerfile",
338+
Target: target,
339+
Arch: testArch,
340+
},
341+
})
337342
})
338-
})
339-
}(t, arch)
343+
}(t, sigtype, arch)
344+
}
340345
}
341346
}
342347

testdata/acceptance/deb.dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,15 @@ RUN debsig-verify /tmp/foo.deb | grep "debsig: Verified package from 'Test packa
8585
RUN echo "" > /etc/dpkg/dpkg.cfg
8686
RUN dpkg -i /tmp/foo.deb
8787

88+
# ---- signed dpkg-sig test ----
89+
FROM test_base AS dpkg-signed
90+
COPY keys/pubkey.gpg /tmp/gpg.key
91+
RUN apt update -y
92+
RUN apt install -y gnupg
93+
RUN gpg --import /tmp/gpg.key
94+
RUN gpg --verify /tmp/foo.deb
95+
RUN dpkg -i /tmp/foo.deb
96+
8897
# ---- overrides test ----
8998
FROM min AS overrides
9099
RUN test -e /usr/bin/fake
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "foo"
2+
arch: "${BUILD_ARCH}"
3+
platform: "linux"
4+
version: "v1.0.0"
5+
maintainer: "John Doe <john@example.com>"
6+
description: This package is signed
7+
vendor: "FooBarCorp"
8+
homepage: "http://example.com"
9+
contents:
10+
- src: ./testdata/fake
11+
dst: /usr/bin/fake
12+
deb:
13+
signature:
14+
method: dpkg-sig
15+
key_file: ./internal/sign/testdata/privkey_unprotected.asc

0 commit comments

Comments
 (0)