Skip to content

Commit

Permalink
add quote to Windows env
Browse files Browse the repository at this point in the history
  • Loading branch information
spowelljr committed Dec 16, 2021
1 parent 9200267 commit 6451652
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion hack/jenkins/common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Write-GithubStatus {

$env:SHORT_COMMIT=$env:COMMIT.substring(0, 7)
$gcs_bucket="minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:ROOT_JOB_ID"
$env:MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE=true
$env:MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE="true"

# Docker's kubectl breaks things, and comes earlier in the path than the regular kubectl. So download the expected kubectl and replace Docker's version.
(New-Object Net.WebClient).DownloadFile("https://dl.k8s.io/release/v1.20.0/bin/windows/amd64/kubectl.exe", "C:\Program Files\Docker\Docker\resources\bin\kubectl.exe")
Expand Down
3 changes: 3 additions & 0 deletions pkg/drivers/kic/oci/cli_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ func PrefixCmd(cmd *exec.Cmd) *exec.Cmd {
func suppressDockerMessage() bool {
envKey := "MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE"
env := os.Getenv(envKey)
if env == "" {
return false
}
suppress, err := strconv.ParseBool(env)
if err != nil {
msg := fmt.Sprintf("failed to parse bool from the %s env, defaulting to 'false'; received: %s: %v", envKey, env, err)
Expand Down
Binary file added test/integration/.mount_start_test.go.swp
Binary file not shown.

0 comments on commit 6451652

Please sign in to comment.