Skip to content

[release/1.6] cherry-pick: Update TestNormalize to only test Windows#6673

Merged
kzys merged 1 commit intocontainerd:release/1.6from
estesp:cp-6569
Mar 14, 2022
Merged

[release/1.6] cherry-pick: Update TestNormalize to only test Windows#6673
kzys merged 1 commit intocontainerd:release/1.6from
estesp:cp-6569

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Mar 12, 2022

The output of platforms.DefaultSpec() and the normalized version of the
default platform on 32- and 64-bit ARM are not comparable. This test
was added to validate not losing Windows-specific information during
normalize of the platform object, so for now we are moving this to be a
Windows-only test until we resolve the right behavior on ARM.

Signed-off-by: Phil Estes [email protected]
(cherry picked from commit 807ded4)

This should allow ARM64 testing to be successful on this release branch again.

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Mar 12, 2022

Cherry-pick of #6569

@mikebrow
Copy link
Copy Markdown
Member

maybe have to cherry pick #6666 first..

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

The output of platforms.DefaultSpec() and the normalized version of the
default platform on 32- and 64-bit ARM are not comparable. This test
was added to validate not losing Windows-specific information during
normalize of the platform object, so for now we are moving this to be a
Windows-only test until we resolve the right behavior on ARM.

Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit 807ded4)
@kzys kzys merged commit 104824c into containerd:release/1.6 Mar 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants