Commit Graph

3372 Commits

Author SHA1 Message Date
Miloslav Trmač
48a05d71f0 Merge pull request #2767 from lsm5/release-1.21-packit-backport
[release-1.21] Packit: use `post-modifications` hook to update downstream TMT plan
2025-12-08 19:15:56 +01:00
Lokesh Mandvekar
dec587b480 Packit: use post-modifications hook to update downstream TMT plan
`prepare-files` action was interfering with spec file update which caused
https://github.com/containers/skopeo/issues/2760 .

`post-modifications` needs to be limited to the propose_downstream job or
else it will interfere with upstream PR copr builds.

Also, s/PACKIT_PROJECT_TAG/PACKIT_PROJECT_VERSION/ .

Co-authored-by: Nikola Forró <nforro@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

(cherry picked from commit e26a4237fc)
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-12-08 09:03:51 -05:00
Miloslav Trmač
8bd9c541f0 Bump to 1.21.0
- New support for creating "simple signing" signatures using Sequoia-PGP,
  dependent on a build tag that enables it
- New option (skopeo copy --force-compression-format)
- New option --user-agent-prefix
- TLS options on the command line of (skopeo sync) take precedence
  over options in YAML

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
v1.21.0
2025-11-28 11:28:17 +01:00
Miloslav Trmač
7c934acec9 Merge pull request #2741 from lsm5/podman-next-no-notify
Packit: Do not notify on podman-next copr build failure
2025-11-10 15:40:33 +01:00
Lokesh Mandvekar
399adc0ef8 Packit: Do not notify on podman-next copr build failure
These happen after commit to upstream and don't affect upstream.

These notifications only end up adding unnecessary noise.

Overall build failures can happen for a variety of reasons like copr
infra, outdated toolchain on some environments etc.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-11-10 09:13:23 -05:00
Paul Holzinger
75f2311b4c Merge pull request #2720 from mtrmac/empty-sigstore
Allow using sigstore keys with empty passphrases
2025-11-10 14:48:10 +01:00
Miloslav Trmač
b7856d6be6 Support empty sigstore passphrases, for cosign compatibility
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-11-10 14:24:36 +01:00
Miloslav Trmač
db81e690a7 Make TestSharedCopyOptionsCopyOptions table-driven
Should not change (test) behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-11-10 14:24:29 +01:00
Paul Holzinger
9e00374ce2 Merge pull request #2740 from mtrmac/retry
Use retries in more cases of copying from external registries
2025-11-10 14:19:26 +01:00
Miloslav Trmač
fe086daee7 Use retries in more cases of copying from external registries
We added retries to other registry operations before,
these were missed for some reason.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-11-10 13:54:43 +01:00
Miloslav Trmač
00de3af75f Merge pull request #2731 from lsm5/test-system-fix
Fix test-system and remove stale Makefile target
2025-11-05 20:07:55 +01:00
Lokesh Mandvekar
8181f14eaa Makefile: remove stale target
Old cruft. Isn't even expected to work. Not used anywhere.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-11-05 13:36:52 -05:00
Lokesh Mandvekar
85a14032cc Makefile: use hack/test-system.sh for test-system-local
This will ensure both `test-system` and `test-system-local` work.

The `test-system` target will use the skopeo binary at `./bin/skopeo`.
Setting SKOPEO_BINARY should have no effect on it.

The `test-system-local` (and `test-integration-local`) target can use
SKOPEO_BINARY at any location. This will be useful in CI where we need to test
skopeo installed by the package at /usr/bin.

Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-11-05 13:36:43 -05:00
Lokesh Mandvekar
7ae3e0bc63 Recreate hack/test-system.sh
`hack/test-system.sh` earlier removed in commit 7e235ea contained
a storage.conf setup useful for running system tests in skopeo_cidev
container.

Getting rid of that also broke `make test-system` because the
systemtest: `copy: additional tag` started to break.

Running `make test-system-local` isn't ideal for local environments due
to creation of system-global containers with predictable names.
See: https://github.com/containers/skopeo/issues/2701#issuecomment-3415769846

So, this commit resurrects hack/test-system.sh. Followup commit will
modify Makefile targets to use this script again.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-11-05 08:51:04 -05:00
Miloslav Trmač
13f1418f74 Merge pull request #2737 from containers/renovate/golangci-golangci-lint-2.x
chore(deps): update dependency golangci/golangci-lint to v2.6.1
2025-11-04 19:27:42 +01:00
renovate[bot]
f3e66b8fa0 chore(deps): update dependency golangci/golangci-lint to v2.6.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-11-04 14:36:33 +00:00
Miloslav Trmač
bcfc9ce669 Merge pull request #2736 from containers/renovate/github.com-opencontainers-image-spec-digest
fix(deps): update github.com/opencontainers/image-spec digest to 26647a4
2025-11-03 17:34:29 +01:00
renovate[bot]
f399e1d0f0 fix(deps): update github.com/opencontainers/image-spec digest to 26647a4
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-11-01 03:32:10 +00:00
Miloslav Trmač
85598438ce Merge pull request #2734 from containers/renovate/golangci-golangci-lint-2.x
chore(deps): update dependency golangci/golangci-lint to v2.6.0
2025-10-30 21:16:20 +01:00
renovate[bot]
f23b6fb8f1 chore(deps): update dependency golangci/golangci-lint to v2.6.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-30 00:57:50 +00:00
Colin Walters
53f9612136 main: Add support for overriding HTTP User-Agent
I want this for https://github.com/bootc-dev/bootc/issues/1686
so we can distinguish pulls there.

But more generally it's can be a good idea for people writing
scripts using skopeo to set custom user agents so that registries
can more easily trace which actors are performing tasks.

Assisted-by: Claude Code
Signed-off-by: Colin Walters <walters@verbum.org>
2025-10-20 19:40:17 +02:00
Miloslav Trmač
6b2c20caef Merge pull request #2726 from containers/renovate/go.podman.io-common-0.x
fix(deps): update module go.podman.io/common to v0.66.0
2025-10-20 19:16:28 +02:00
renovate[bot]
f9d4a40261 fix(deps): update module go.podman.io/common to v0.66.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-20 18:41:44 +02:00
Miloslav Trmač
77325403b2 Merge pull request #2727 from containers/renovate/go.podman.io-image-v5-5.x
fix(deps): update module go.podman.io/image/v5 to v5.38.0
2025-10-20 18:30:40 +02:00
renovate[bot]
ff5394430c fix(deps): update module go.podman.io/image/v5 to v5.38.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-20 13:54:02 +00:00
Miloslav Trmač
83ca23a899 Merge pull request #2728 from containers/renovate/go.podman.io-storage-1.x
fix(deps): update module go.podman.io/storage to v1.61.0
2025-10-20 15:52:35 +02:00
renovate[bot]
7a9cea1bf1 fix(deps): update module go.podman.io/storage to v1.61.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-18 05:45:58 +00:00
Miloslav Trmač
d2a1740f0d Merge pull request #2719 from mtrmac/generate-newline
Add missing newline to the output of (skopeo generate-sigstore-key)
2025-10-14 18:20:35 +02:00
Miloslav Trmač
144e9151bd Add missing newline to the output of (skopeo generate-sigstore-key)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-13 20:47:47 +02:00
Miloslav Trmač
01f5061a82 Merge pull request #2722 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.36.0
2025-10-09 11:17:30 +02:00
renovate[bot]
a45ceb03d3 fix(deps): update module golang.org/x/term to v0.36.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-08 17:44:41 +00:00
Miloslav Trmač
3d18794ee8 Merge pull request #2711 from mtrmac/sync-tls
Simplify tests for #2710
2025-10-02 19:39:15 +02:00
Miloslav Trmač
d287ec074a Fold the test cases of TestSyncTLSPrecedence to a single line each
... to make it much easier to compare+contrast.

Should not change (test) behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-02 17:42:49 +02:00
Miloslav Trmač
286c599025 Remove the explicit test name
... and construct it from the primary inputs instead.

The name doesn't hurt in itself, but it ~forces us to use
multi-line test data, making this larger and harder to read than
necessary.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-02 17:42:40 +02:00
Miloslav Trmač
5699f10b40 Construct the source context from CLI instead of manually
This changes the test, we drop the two inputs that can't happen
in practice; and, instead, test the default situation of no TLS
options provided anywhere.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-02 17:42:29 +02:00
Miloslav Trmač
6d2144e685 Use a real YAML fragment instead of constructing inputs manually
To be more clearly representative.

Should not change (test) behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-02 17:42:19 +02:00
Miloslav Trmač
1e6817a12c Merge the two TestTLSPrecedence tests
They use exactly the same body, and differ only in data
(and we are going to keep iterating on the body).

Should not change (test) behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-10-02 17:41:52 +02:00
Lokesh Mandvekar
fcf9dd6911 Merge pull request #2713 from containers/renovate/golangci-golangci-lint-2.x
Update dependency golangci/golangci-lint to v2.5.0
2025-10-02 10:03:53 -04:00
renovate[bot]
d80c776b87 Update dependency golangci/golangci-lint to v2.5.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-01 16:04:49 +00:00
Miloslav Trmač
d79dd05773 Merge pull request #2717 from containers/renovate/github.com-opencontainers-image-spec-digest
Update github.com/opencontainers/image-spec digest to 6519a62
2025-10-01 17:57:30 +02:00
renovate[bot]
c7a3a90716 Update github.com/opencontainers/image-spec digest to 6519a62
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-01 01:46:04 +00:00
Miloslav Trmač
b810e9eb46 Merge pull request #2710 from andya1lan/fix-sync-tls-verify-yaml
sync: honor CLI/global tls-verify unless YAML explicitly sets tls-verify
2025-09-19 18:46:58 +02:00
Andy Allan
dbd18b9728 sync: honor CLI/global tls-verify unless YAML explicitly sets tls-verify
Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>

chore: make linter happy

Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>

test(sync): refactor TLS override precedence test to table-driven

Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>

test(sync): refactor cases when YAML omitted

Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>

test(sync): readd TLS verification tests when yaml specfied

Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>

test(sync): readd TLS verification tests when yaml specfied and `incomingDaemonSkip` condition

Signed-off-by: Andy Allan <58987282+andya1lan@users.noreply.github.com>
2025-09-19 18:07:14 +08:00
Miloslav Trmač
f0f0c2c639 Merge pull request #2703 from lsm5/integration-test-binary-path
test-integration-local: use SKOPEO_BINARY if set
2025-09-17 15:06:55 +02:00
Lokesh Mandvekar
a489ea39a7 test-integration-local: use SKOPEO_BINARY if set
Else use ./bin/skopeo as the default binary.

This makes it a lot more flexible compared to just searching and using
the first skopeo in PATH. Also, allows to avoid any binary installation
to /usr/bin.

The SKOPEO_BINARY evaluation logic has been moved to a separate and
reusable Makefile target.

Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-09-17 08:31:10 -04:00
Miloslav Trmač
96eabba0b4 Merge pull request #2645 from mtrmac/sequoia-cli
Add --sign-by-sq-fingerprint
2025-09-11 19:32:58 +02:00
Miloslav Trmač
f59e8938db Add --sign-by-sq-fingerprint and an integration test
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:40 +02:00
Miloslav Trmač
9753a1a11a Also build+test with Sequoia
Relies on https://github.com/containers/automation_images/pull/411 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:27 +02:00
Miloslav Trmač
cba2164671 Update CI images
... from https://github.com/containers/automation_images/pull/416

That requires updating tests to also work with rust-podman-sequoia 0.2.0:
d41fefaa1f changed
how the error is reported.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:20 +02:00
Miloslav Trmač
b258da23c2 Update conditions for signing tests
NewEphemeralSigningMechanism() may, with Sequoia, return
a mechanism which !SupportsSigning(); so, to determine that,
test with a non-ephemeral mechanism instead. (That's likely
actually faster, because we create a GNUPGHOME in these tests
anyway, so we avoid creating an deleting a separate temporary
directory.)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:10 +02:00