Fix Conformance tests on ARM64 #5990
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Honny1 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
LGTM |
imagebuildah/build.go
Outdated
| buildVariant := b.BuiltinArgDefaults["BUILDVARIANT"] | ||
| buildPlatform := b.BuiltinArgDefaults["BUILDPLATFORM"] | ||
| cleanedBuildPlatform, _ := strings.CutSuffix(buildPlatform, "/"+buildVariant) | ||
| b.BuiltinArgDefaults["BUILDPLATFORM"] = cleanedBuildPlatform | ||
| b.BuiltinArgDefaults["BUILDVARIANT"] = "" |
There was a problem hiding this comment.
The "BUILD..." values appear to be set at https://github.com/openshift/imagebuilder/blob/master/dispatchers.go#L40-L56. Why not fix them there?
There was a problem hiding this comment.
I don't know if any other user of imagebuilder would expect that "BUILD..." should be empty by default to match docker.
There was a problem hiding this comment.
Why would they expect something different?
There was a problem hiding this comment.
They might expect something different because the current behavior (setting BUILD..). Changing it to empty by default would potentially break something that rely on it. But I will try to change it in imagebuilder.
There was a problem hiding this comment.
Honny1
force-pushed
the
fix-arm64
branch
5 times, most recently
from
93b4c13 to
342e815
Compare
This fixes getting of cpu variants for ARM64 Fixes the TestConformance/setuid-file-in-archive test on ARM64. Signed-off-by: Jan Rodák <[email protected]>
New imagebuilder contains fix that sets empty TARGETVARIANT and BUILDVARIANT. Docker does not set these values for ARM64. This fixes the TestConformance/multistage-builtin-args and TestConformance/builtins tests on ARM64. Signed-off-by: Jan Rodák <[email protected]>
What type of PR is this?
/kind bug
/kind failing-test
What this PR does / why we need it:
This PR fixes bugs discovered by running Conformance tests on ARM64.
Fixed tests:
TestConformance/setuid-file-in-archiveTestConformance/multistage-builtin-argsTestConformance/builtinsHow to verify it
Execute Conformance tests on ARM system.
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?