Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only build Windows binary on supported platforms #75

Closed
wants to merge 1 commit into from

Conversation

trozet
Copy link
Contributor

@trozet trozet commented Jan 9, 2020

Patch changes docker building to only build windows on x86 platforms.

Signed-off-by: Tim Rozet trozet@redhat.com

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 9, 2020
@trozet
Copy link
Contributor Author

trozet commented Jan 9, 2020

@dcbw Windows is supported on ARM architectures as well...not sure if those should be supported as well here?

@trozet
Copy link
Contributor Author

trozet commented Jan 9, 2020

I can also remove the windows directory after the noop copy, if we dont want a noop file/windows directory to even exist at all on unsupported arch. Just let me know.

@danwinship
Copy link
Contributor

do we have any way to test that this actually does fix the s390x build?

@trozet
Copy link
Contributor Author

trozet commented Jan 9, 2020

@danwinship I tested it in a negative scenario by using an unsupported arch and it built just fine.

Patch changes docker building to only build windows on x86 platforms.

Signed-off-by: Tim Rozet <trozet@redhat.com>
@trozet
Copy link
Contributor Author

trozet commented Jan 10, 2020

/test e2e-aws-ovn

@trozet
Copy link
Contributor Author

trozet commented Jan 10, 2020

/retest

1 similar comment
@trozet
Copy link
Contributor Author

trozet commented Jan 10, 2020

/retest


# only build windows on supported platforms
# otherwise create a dummy windows binary to allow subsequent COPY to still work
RUN if [[ $(arch) =~ ^(x86_64|i386)$ ]]; then \
Copy link
Contributor

Choose a reason for hiding this comment

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

ugh... this is really ugly and I don't have any good suggestion on how to improve it, except that maybe this means we should not be building the windows binary here (since we don't actually need it to be in this image anyway and are only doing that as a hack).

@dcbw?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

there is a PR to move it into its own image: #68

@danwinship
Copy link
Contributor

/lgtm
/approve
/hold

if we don't come up with a better fix feel free to "/hold cancel" to get this to merge

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 10, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, trozet

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 10, 2020
@openshift-ci-robot
Copy link
Contributor

@trozet: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-ovn db1e485 link /test e2e-aws-ovn

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@trozet
Copy link
Contributor Author

trozet commented Jan 10, 2020

closing in favor of #76

@trozet trozet closed this Jan 10, 2020
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants