DO NOT MERGE: Vendor unmerged https://github.com/containers/storage/pull/1399

[mtrmac]

Signed-off-by: Miloslav Trmač [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mtrmac
Once this PR has been reviewed and has the lgtm label, please assign umohnani8 for approval by writing /assign @umohnani8 in a comment. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

• OWNERS

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

[mtrmac]

Now includes #4352 to avoid callers of .Locked().

[mtrmac]

Consistent failures with

not ok 65 build: test race in updating image name while performing parallel commits
[+0303s] # (from function `assert' in file ./helpers.bash, line 423,
[+0303s] #  in test file ./bud.bats, line 603)
[+0303s] #   `assert "$(cat ${TEST_SCRATCH_DIR}/id.* | wc -c)" = 1775 "Total chars in all id.* files"' failed
[+0303s] # /var/tmp/go/src/github.com/containers/buildah/tests /var/tmp/go/src/github.com/containers/buildah/tests
[+0303s] # # [checking for: docker.io/library/alpine]
[+0303s] # # [restoring from cache: /var/tmp/buildah-image-cache.8993 / docker.io/library/alpine]
[+0303s] # Getting image source signatures
[+0303s] # Copying blob sha256:9d16cba9fb961d1aafec9542f2bf7cb64acfc55245f9e4eb5abecd4cdc38d749
[+0303s] # Copying config sha256:961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4
[+0303s] # Writing manifest to image destination
[+0303s] # Storing signatures
[+0303s] # Error: mounting new container: mounting build container "003f239f34edaf56f1073e31c8d9deec1fc258bbff6306dbf879456f9075c9ea": layer not known

(with varying layer IDs). That’s bad. What did I break?

[mtrmac]

That’s bad. What did I break?

For the record, containers/storage#1400 is what I broke, and hopefully fixed.

[openshift-merge-robot]

@mtrmac: PR needs rebase.

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/test-infra repository.

[mtrmac]

containers/storage#1399 was now merged.