Merge pull request #29794 from podman-container-tools/renovate/github.com-onsi-ginkgo-v2-2.x

Update module github.com/onsi/ginkgo/v2 to v2.33.0

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/moby/sys/user v0.4.1
 	github.com/moby/term v0.5.2
 	github.com/nxadm/tail v1.4.11
-	github.com/onsi/ginkgo/v2 v2.32.2
+	github.com/onsi/ginkgo/v2 v2.33.0
 	github.com/onsi/gomega v1.43.1
 	github.com/opencontainers/cgroups v0.1.0
 	github.com/opencontainers/go-digest v1.0.0

go.sum

@@ -281,8 +281,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
-github.com/onsi/ginkgo/v2 v2.32.2 h1:2o6vyFvR6snrJWgRVztC+OwuqqPEMI1UzYl2s2iU7Cg=
-github.com/onsi/ginkgo/v2 v2.32.2/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
+github.com/onsi/ginkgo/v2 v2.33.0 h1:C8gBA6Uc2ZEubiV+SXiu5tZnMTwEmXHgkJwGozKtZf8=
+github.com/onsi/ginkgo/v2 v2.33.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
 github.com/onsi/gomega v1.43.1 h1:vGIPFuYrIO6/0Z09s0I0QQQgFchiX4+tb1re3MScJYo=
 github.com/onsi/gomega v1.43.1/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA=
 github.com/opencontainers/cgroups v0.1.0 h1:6W05KiDvgj1yi/6D13SJCvYx8TAESz67szvHPxhfcrs=

vendor/github.com/onsi/ginkgo/v2/.gitignore

@@ -6,4 +6,5 @@ integration/tmp_*/
 .vscode
 .idea/
 *.log
-*.test
+*.test
+/.release/

vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md

@@ -1,3 +1,19 @@
+## Unreleased
+
+### Features
+
+### Fixes
+
+### Maintenance
+
+## 2.33.0
+
+### Features
+- The JUnit reporter now records each spec's `ReportEntry`s as `<properties>` on its `<testcase>` element, with the entry's name and its JSON-encoded value.  Thanks @pohly! [23db51a]
+
+### Maintenance
+- Releases are now cut by a GitHub Actions workflow (Actions -> Release -> Run workflow) rather than by hand, with changelog entries collected under `## Unreleased` as the work happens.  See RELEASING.md. [8616ecb]
+
 ## 2.32.2
 
 ### Fixes

vendor/github.com/onsi/ginkgo/v2/README.md

@@ -1,6 +1,9 @@
-![Ginkgo](https://onsi.github.io/ginkgo/images/ginkgo.png)
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="docs/images/ginkgo-dark.png">
+  <img alt="Ginkgo" src="docs/images/ginkgo.png">
+</picture>
 
-[![test](https://github.com/onsi/ginkgo/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/onsi/ginkgo/actions?query=workflow%3Atest+branch%3Amaster) | [Ginkgo Docs](https://onsi.github.io/ginkgo/)
+[![test](https://github.com/onsi/ginkgo/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/onsi/ginkgo/actions/workflows/test.yml?query=branch%3Amaster) [![Ginkgo Docs](docs/images/docs-badge.svg)](https://onsi.github.io/ginkgo/) [![Sponsor onsi](docs/images/sponsor-badge.svg)](https://github.com/sponsors/onsi)
 
 ---
 

vendor/github.com/onsi/ginkgo/v2/RELEASING.md

@@ -1,23 +1,85 @@
-A Ginkgo release is a tagged git sha and a GitHub release.  To cut a release:
+# Releasing Ginkgo
 
-1. Ensure CHANGELOG.md is up to date.
-  - Use 
-    ```bash
-    LAST_VERSION=$(git tag --sort=version:refname | tail -n1)
-    CHANGES=$(git log --pretty=format:'- %s [%h]' HEAD...$LAST_VERSION)
-    echo -e "## NEXT\n\n$CHANGES\n\n### Features\n\n### Fixes\n\n### Maintenance\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
-    ```
-   to update the changelog
-  - Categorize the changes into
-    - Breaking Changes (requires a major version)
-    - New Features (minor version)
-    - Fixes (fix version)
-    - Maintenance (which in general should not be mentioned in `CHANGELOG.md` as they have no user impact)
-1. Update `VERSION` in `types/version.go`
-1. Commit, push, and release:
-  ```
-  git commit -m "vM.m.p"
-  git push
-  gh release create "vM.m.p"
-  git fetch --tags origin master
-  ```
+A release is one GitHub Actions run: **Actions → Release → Run workflow → bump: patch | minor**,
+from `master`. From the command line:
+
+```bash
+gh workflow run release.yml -f bump=patch   # or -f bump=minor
+```
+
+The run:
+
+1. Runs the whole test workflow (`test.yml`). Nothing else happens unless it passes.
+2. Runs `scripts/release.sh`, which
+   - computes the next version from `VERSION` in `types/version.go`,
+   - renames `## Unreleased` in `CHANGELOG.md` to `## X.Y.Z` (dropping empty `###` subsections) and
+     puts a fresh, empty `## Unreleased` above it,
+   - writes `VERSION` and stamps the version into every plugin manifest
+     (`plugins/*/.claude-plugin/plugin.json`), so the Claude Code plugin ships in lockstep,
+   - commits `vX.Y.Z` as `github-actions[bot]`, tags it `vX.Y.Z`, and pushes the commit and the tag
+     together (`git push --atomic`, fast-forward only),
+   - creates the GitHub release `vX.Y.Z`, whose notes are the body of `## X.Y.Z`.
+
+The Go module is released by the `vX.Y.Z` tag. There is no other release tooling.
+
+## The changelog
+
+`CHANGELOG.md` starts with an `## Unreleased` section:
+
+```markdown
+## Unreleased
+
+### Features
+
+### Fixes
+
+### Maintenance
+
+## 2.32.2
+...
+```
+
+Add an entry under `## Unreleased` with each user-facing change, as you make it. Never edit a
+released section. Empty subsections are dropped when the section is released, so leaving
+`### Maintenance` empty costs nothing.
+
+If `## Unreleased` has no entries (only blank lines and `###` headings), the release stops before
+changing anything — and so does a re-run after a successful release.
+
+To draft entries from the commits since the last release:
+
+```bash
+git log --pretty=format:'- %s [%h]' "$(git tag --sort=version:refname | tail -n1)"..HEAD
+```
+
+Categorize what you keep into
+
+- Breaking changes (these need a major version, which this workflow does not cut)
+- `### Features` (minor version)
+- `### Fixes` (patch version)
+- `### Maintenance` (in general, changes with no user impact don't belong in the changelog at all)
+
+## If a release fails
+
+Open the failed run and click **Re-run failed jobs**. A re-run checks out the same commit as the
+first attempt and computes the same version. It resumes based on what already exists:
+
+| Where it failed | What a re-run does |
+|---|---|
+| Tests, or before the push | Nothing reached GitHub. The re-run starts over. |
+| The push (master moved during the run) | The re-run fails the same way. Start a new run from the current master. |
+| After the push (the tag `vX.Y.Z` is on GitHub) | The re-run builds from the tag instead of making a new commit. |
+| Creating the GitHub release | The release is created, or its notes are refreshed if it already exists. |
+
+The commit and the tag are pushed together, so the tag being on GitHub means the release commit is
+on master too.
+
+## Trying the release script locally
+
+`GINKGO_RELEASE_DRY_RUN=1 scripts/release.sh patch` does the whole release locally — the changelog
+and version rewrites, the commit and the tag — then skips the push and the GitHub release. It still
+checks `origin` for an existing tag, so run it in a throwaway clone whose `origin` is a local bare
+repository, not in your working copy.
+
+The version and changelog logic lives in `scripts/release`, with its own Ginkgo suite
+(`scripts/release/release_test.go`) that runs with the rest of the suites.

vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go

@@ -11,6 +11,7 @@ The schema used for the generated JUnit xml file was adapted from https://llg.cu
 package reporters
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"fmt"
 	"maps"
@@ -136,6 +137,8 @@ type JUnitTestCase struct {
 	SystemOut string `xml:"system-out,omitempty"`
 	//SystemOut maps onto any captured GinkgoWriter output - maps onto SpecReport.CapturedGinkgoWriterOutput
 	SystemErr string `xml:"system-err,omitempty"`
+	//Properties captures any ReportEntries attached to the spec via AddReportEntry, as key/value pairs with the JSON dump of the value as value.
+	Properties *JUnitProperties `xml:"properties,omitempty"`
 }
 
 type JUnitSkipped struct {
@@ -241,6 +244,20 @@ func GenerateJUnitReportWithConfig(report types.Report, dst string, config Junit
 		if !config.OmitCapturedStdOutErr {
 			test.SystemOut = systemOutForUnstructuredReporters(spec)
 		}
+		if len(spec.ReportEntries) > 0 {
+			properties := JUnitProperties{}
+			for _, entry := range spec.ReportEntries {
+				value, err := json.Marshal(entry.GetRawValue())
+				if err != nil {
+					value = []byte(fmt.Sprintf("%q", err.Error()))
+				}
+				properties.Properties = append(properties.Properties, JUnitProperty{
+					Name:  entry.Name,
+					Value: string(value),
+				})
+			}
+			test.Properties = &properties
+		}
 		suite.Tests += 1
 
 		switch spec.State {

vendor/github.com/onsi/ginkgo/v2/types/version.go

@@ -1,3 +1,3 @@
 package types
 
-const VERSION = "2.32.2"
+const VERSION = "2.33.0"

vendor/modules.txt

@@ -475,7 +475,7 @@ github.com/nxadm/tail/ratelimiter
 github.com/nxadm/tail/util
 github.com/nxadm/tail/watch
 github.com/nxadm/tail/winfile
-# github.com/onsi/ginkgo/v2 v2.32.2
+# github.com/onsi/ginkgo/v2 v2.33.0
 ## explicit; go 1.25.0
 github.com/onsi/ginkgo/v2
 github.com/onsi/ginkgo/v2/config