Skip to content

TestConformanceExternal/copy and env interaction: update test context; update deps; tag 1.2.22 - #325

Merged
openshift-merge-bot[bot] merged 5 commits into
openshift:masterfrom
nalind:update-deps
Aug 26, 2026
Merged

TestConformanceExternal/copy and env interaction: update test context; update deps; tag 1.2.22#325
openshift-merge-bot[bot] merged 5 commits into
openshift:masterfrom
nalind:update-deps

Conversation

@nalind

@nalind nalind commented Aug 18, 2026

Copy link
Copy Markdown
Member

Update the context directory used for a conformance test that references an external git repository to keep up with changes on the main branch. Fix a race condition in a conformance test. And then bump our version to 1.2.22.

While we're in here, bump some of our dependencies:
Bump github.com/containerd/platforms from v1.0.0-rc.4 to v1.0.0-rc.5
Bump github.com/moby/buildkit from v0.29.0 to v0.31.2 (0.32 would bump us to Go 1.26)
Bump github.com/moby/go-archive from v0.2.0 to v0.3.3
Bump github.com/moby/moby/api from v1.54.2 to v1.55.0
Bump github.com/stretchr/testify from v1.11.1 to v1.12.1
Bump go.podman.io/storage from v1.62.0 to v1.64.0

The buildkit update resolves CVE-2026-61711 and CVE-2026-61712.
The go-archive update resolves CVE-2026-17106.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2026
@TomSweeneyRedHat

Copy link
Copy Markdown
Contributor

LGTM
but the tests seem to be a bit upset.

@nalind

nalind commented Aug 20, 2026

Copy link
Copy Markdown
Member Author

LGTM but the tests seem to be a bit upset.

Transient error, a manual restart was enough.

Avoid a race where `file` may or may not be pointed at the file that
we're piping its output to during a build.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind
nalind force-pushed the update-deps branch 2 times, most recently from 8bebfe4 to 1a03e96 Compare August 25, 2026 19:44
@nalind nalind changed the title TestConformanceExternal/copy and env interaction: update test context; update deps TestConformanceExternal/copy and env interaction: update test context; update deps; tag 1.2.22 Aug 25, 2026
@TomSweeneyRedHat

Copy link
Copy Markdown
Contributor

Assuming happy tests,
LGTM

@nalind

nalind commented Aug 25, 2026

Copy link
Copy Markdown
Member Author

Tests are passing.
The Go Report Card badge we linked to from README.md is reflecting that the service has been retired, so I added a commit to remove it.

nalind added 4 commits August 26, 2026 08:23
Bump github.com/containerd/platforms from v1.0.0-rc.4 to v1.0.0-rc.5
Bump github.com/moby/buildkit from v0.29.0 to v0.31.2
Bump github.com/moby/go-archive from v0.2.0 to v0.3.3
Bump github.com/moby/moby/api from v1.54.2 to v1.55.0
Bump github.com/stretchr/testify from v1.11.1 to v1.12.1
Bump go.podman.io/storage from v1.62.0 to v1.64.0

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Update version information to mark this as v1.2.22.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Update version information to mark this as v1.2.23-dev.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@openshift-ci

openshift-ci Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

@nalind: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@TomSweeneyRedHat

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2026
@openshift-ci

openshift-ci Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind, TomSweeneyRedHat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [TomSweeneyRedHat,nalind]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot
openshift-merge-bot Bot merged commit 190b708 into openshift:master Aug 26, 2026
3 checks passed
@nalind
nalind deleted the update-deps branch August 26, 2026 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants