[release-1.29] conformance test: ignore file type bits when comparing layers

[nalind]

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

When comparing layer payloads during conformance tests, mask off any file type bits that the tar headers in the layers might have included. Extracted from #4829.

How to verify it

Conformance tests!

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

[nalind]

/retitle [release-1.29] conformance test: ignore file type bits when comparing layers

[nalind]

/cc @cevich

[cevich]

Great! Thanks for doing this. May I help backport it to the other 5 afflicted release branches? Or is there a way to make the bot do it?

[cevich]

LGTM

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [cevich,nalind]

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

[nalind]

Great! Thanks for doing this. May I help backport it to the other 5 afflicted release branches? Or is there a way to make the bot do it?

The bot has a "/cherry-pick" command for that - it posted the link for the full list of commands it supports, but the short version is that the command expects the target branch as an argument.

[nalind]

(If you "/lgtm", the bot will add this PR to its merge queue.)

[cevich]

Oh, right, yeah that's it. I seem to remember this PR needs to merge first in order for /cherry-pick to work.

/lgtm

[cevich]

/cherry-pick release-1.24

[openshift-cherrypick-robot]

@cevich: only containers org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick release-1.24

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.

[cevich]

WTF?!?!?!? I'm an org-admin!?!?!?!?! Sheesh, let me see if I can add myself...

[cevich]

Ha! Nope, github says "already a member" 😢

@nalind would you mind doing the bot commands. I can help with the PRs it creates as needed.

[nalind]

/cherry-pick release-1.24

[openshift-cherrypick-robot]

@nalind: #5257 failed to apply on top of branch "release-1.24":

Applying: conformance test: ignore file type bits when comparing layers
Using index info to reconstruct a base tree...
M	.cirrus.yml
M	tests/conformance/conformance_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/conformance/conformance_test.go
CONFLICT (content): Merge conflict in tests/conformance/conformance_test.go
Auto-merging .cirrus.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 conformance test: ignore file type bits when comparing layers
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.24

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.

[nalind]

Your membership is set to "private", so the bot might not know you're in the org.

[cevich]

Your membership is set to "private", so the bot might not know you're in the org.

Oh! That could be, I don't ever remember setting that. Thanks, I'll fix.

[cevich]

/cherry-pick release-1.21

[openshift-cherrypick-robot]

@cevich: #5257 failed to apply on top of branch "release-1.21":

Applying: conformance test: ignore file type bits when comparing layers
Using index info to reconstruct a base tree...
M	.cirrus.yml
M	tests/conformance/conformance_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/conformance/conformance_test.go
CONFLICT (content): Merge conflict in tests/conformance/conformance_test.go
Auto-merging .cirrus.yml
CONFLICT (content): Merge conflict in .cirrus.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 conformance test: ignore file type bits when comparing layers
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.21

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.

[cevich]

Bah, oh well, guess we gotta do it manually.