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.

Sign up for GitHub

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

Jump to bottom

Bug 1990014: Use cmd for Windows pods #907

Merged
merged 2 commits into from Sep 1, 2021
Merged

Bug 1990014: Use cmd for Windows pods #907

merged 2 commits into from Sep 1, 2021

Conversation

deejross
Copy link
Contributor

No description provided.

@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 23, 2021

@deejross: This pull request references Bugzilla bug 1990014, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

Bug 1990014: Use powershell for Windows pods

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.

aravindhp
aravindhp reviewed Aug 23, 2021
View reviewed changes
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for working on this, @deejross

pkg/cli/debug/debug.go Outdated
@@ -62,6 +62,9 @@ const (
containerResourcesAnnotationPrefix = "resources.workload.openshift.io/"
// podWorkloadTargetAnnotationPrefix contains the prefix for the pod workload target annotation
podWorkloadTargetAnnotationPrefix = "target.workload.openshift.io/"
kubeOSNodeSelector = "kubernetes.io/os"
commandLinuxShell = "/bin/sh"
commandWindowsShell = "powershell"
Copy link
Contributor

Choose a reason for hiding this comment

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

It is risky to use powershell.exe. In certain Windows container images, the binary is pwsh.exe. I suggest using cmd.exe (the older command interpreter) which is guaranteed to exist in all Windows container images.

@deejross deejross changed the title Bug 1990014: Use powershell for Windows pods Bug 1990014: Use cmd for Windows pods Aug 23, 2021
@deejross
Copy link
Contributor Author

/restest-required

@deejross
Copy link
Contributor Author

/retest-required

soltysh
soltysh approved these changes Sep 1, 2021
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/override ci/prow/e2e-agnostic-cmd
unrelated failure and we're actively working on improving the reliability of that test suite.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deejross, soltysh

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
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/e2e-agnostic-cmd

In response to this:

/lgtm
/approve
/override ci/prow/e2e-agnostic-cmd
unrelated failure and we're actively working on improving the reliability of that test suite.

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 9944790 into openshift:master Sep 1, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

@deejross: All pull requests linked via external trackers have merged:

Bugzilla bug 1990014 has been moved to the MODIFIED state.

In response to this:

Bug 1990014: Use cmd for Windows pods

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.

@aravindhp aravindhp mentioned this pull request Jan 18, 2022
Merged
@deejross
Copy link
Contributor Author

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link

@deejross: #907 failed to apply on top of branch "release-4.8":

Applying: Use powershell for Windows pods
.git/rebase-apply/patch:24: trailing whitespace.
		changed to '/bin/sh' for Linux containers or 'powershell' for Windows containers, 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/cli/debug/debug.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cli/debug/debug.go
CONFLICT (content): Merge conflict in pkg/cli/debug/debug.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use powershell for Windows pods
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-4.8

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aravindhp aravindhp aravindhp left review comments

@soltysh soltysh soltysh approved these changes

@zhouying7780 zhouying7780 Awaiting requested review from zhouying7780

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@deejross @openshift-bot @openshift-cherrypick-robot @soltysh @aravindhp @openshift-merge-robot