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

fix: make run_console_local.sh working on WSLv1 #1154

Merged
merged 2 commits into from
Dec 21, 2019
Merged

fix: make run_console_local.sh working on WSLv1 #1154

merged 2 commits into from
Dec 21, 2019

Conversation

wilmardo
Copy link
Contributor

@wilmardo wilmardo commented Nov 27, 2019

Description of the change:

  • Updates the if statement which check for WSL.
  • Quoting of variables to mitigate SC2086
  • Make sh compatible
  • Removes -it from docker run, no need to start interactive when redirecting output

Motivation for the change:

The script wasn't working for me in WSlv1 because [[ "$(< /proc/version)" == *"@(Microsoft|WSL)"* ]] never evaluated to true.
Simplified the statement by using uname -r (no need to grep for Microsoft or WSL) and by using grep

The second commit is for making the script sh compatible to support more environments. I couldn't check it on MacOS but according to the internet OSTYPE should be defined.
The for loop is needed since the script is much faster in sh and the if statement to check for running is sometimes run before the container has started.

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 27, 2019
@openshift-ci-robot
Copy link
Collaborator

Hi @wilmardo. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 27, 2019
Signed-off-by: wilmardo <info@wilmardenouden.nl>
Signed-off-by: wilmardo <info@wilmardenouden.nl>
@ecordell
Copy link
Member

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 27, 2019
@ecordell
Copy link
Member

/approve

I'd like to double check that this still works on other systems as well, since we don't have CI for this script.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 27, 2019
@ecordell
Copy link
Member

/retest
/lgtm

verified that it still works on macos!

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, wilmardo

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-merge-robot openshift-merge-robot merged commit 78ac608 into operator-framework:master Dec 21, 2019
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. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants