From 1c4c158327bef4f98f57ebdaf7a528845c5c29fa Mon Sep 17 00:00:00 2001 From: Alonyb Date: Mon, 10 Feb 2020 22:57:30 -0500 Subject: [PATCH 01/26] add new validations to windows workflow --- Makefile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Makefile b/Makefile index bfc0a8656e..0d88f76fc9 100755 --- a/Makefile +++ b/Makefile @@ -277,6 +277,18 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) endif which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... +ifeq ($(OS),Windows_NT) + echo "%cd%" + echo "$(GOPATH)" + dir + PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" + "$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/... + -gofmt -s -w $@ + @#golint: Dns should be DNS (compat sed) + @sed -i -e 's/Dns/DNS/g' $@ && rm -f ./-e + @#golint: Html should be HTML (compat sed) + @sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e +else PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg assets deploy/addons/... -gofmt -s -w $@ @#golint: Dns should be DNS (compat sed) @@ -284,15 +296,26 @@ endif @#golint: Html should be HTML (compat sed) @sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e +endif + pkg/minikube/translate/translations.go: $(shell find "translations/" -type f) ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) endif +ifeq ($(OS),Windows_NT) + which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... + PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" + "$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg translate translations/... + -gofmt -s -w $@ + @#golint: Json should be JSON (compat sed) + @sed -i -e 's/Json/JSON/' $@ && rm -f ./-e +else which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg translate translations/... -gofmt -s -w $@ @#golint: Json should be JSON (compat sed) @sed -i -e 's/Json/JSON/' $@ && rm -f ./-e +endif .PHONY: cross cross: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe ## Build minikube for all platform From bcb71106b1ec553f82dfe0500b9b68de72ddadad Mon Sep 17 00:00:00 2001 From: Alonyb Date: Mon, 10 Feb 2020 22:57:43 -0500 Subject: [PATCH 02/26] add windows base yml --- .github/workflows/main.yml | 271 ++++++++++++++++++++----------------- 1 file changed, 150 insertions(+), 121 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ec7b9b32c..33e54c3319 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,139 +6,168 @@ jobs: docker_ubuntu_16_04: runs-on: ubuntu-16.04 steps: - - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-linux-amd64 - make e2e-linux-amd64 - mkdir -p report - - name: install gopogh - run: | - cd /tmp - GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true - cd - - - name: run integration test - run: | - mkdir -p /tmp/testhome - MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt - - name: generate gopogh report - run: | - export PATH=${PATH}:`go env GOPATH`/bin - go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true - - uses: actions/upload-artifact@v1 - with: - name: docker_on_ubuntu_16_04_report - path: report + - uses: actions/checkout@v2 + - name: build binaries + run: | + make minikube-linux-amd64 + make e2e-linux-amd64 + mkdir -p report + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: docker_on_ubuntu_16_04_report + path: report docker_ubuntu_18_04: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-linux-amd64 - make e2e-linux-amd64 - mkdir -p report - - name: install gopogh - run: | - cd /tmp - GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true - cd - - - name: run integration test - run: | - mkdir -p /tmp/testhome - MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt - - name: generate gopogh report - run: | - export PATH=${PATH}:`go env GOPATH`/bin - go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true - - uses: actions/upload-artifact@v1 - with: - name: docker_on_ubuntu_18_04_report - path: report + - uses: actions/checkout@v2 + - name: build binaries + run: | + make minikube-linux-amd64 + make e2e-linux-amd64 + mkdir -p report + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: docker_on_ubuntu_18_04_report + path: report docker_macos: runs-on: macos-latest steps: - - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-darwin-amd64 - make e2e-darwin-amd64 - mkdir -p report - - name: install docker - run: | + - uses: actions/checkout@v2 + - name: build binaries + run: | + make minikube-darwin-amd64 + make e2e-darwin-amd64 + mkdir -p report + - name: install docker + run: | brew install docker-machine docker || true brew services start docker-machine || true docker version || true - - name: install gopogh - run: | - cd /tmp - GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true - cd - - - name: run integration test - run: | - mkdir -p /tmp/testhome - MINIKUBE_HOME=/tmp/testhome ./out/e2e-darwin-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=./out/minikube-darwin-amd64 2>&1 | tee ./report/testout.txt - - name: generate gopogh report - run: | - export PATH=${PATH}:`go env GOPATH`/bin - go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - gopogh -in ./report/testout.json -out ./report/testout.html -name "docker macos" -repo github.com/kubernetes/minikube/ || true - - uses: actions/upload-artifact@v1 - with: - name: docker_on_macos_report - path: ./report + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome ./out/e2e-darwin-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=./out/minikube-darwin-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker macos" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: docker_on_macos_report + path: ./report none_ubuntu16_04: runs-on: ubuntu-16.04 steps: - - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-linux-amd64 - make e2e-linux-amd64 - mkdir -p report - - name: install gopogh - run: | - cd /tmp - GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true - cd - - - name: run integration test - run: | - mkdir -p /tmp/testhome - MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt - - name: generate gopogh report - run: | - export PATH=${PATH}:`go env GOPATH`/bin - go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true - - uses: actions/upload-artifact@v1 - with: - name: none_on_ubuntu_16_04 - path: report + - uses: actions/checkout@v2 + - name: build binaries + run: | + make minikube-linux-amd64 + make e2e-linux-amd64 + mkdir -p report + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: none_on_ubuntu_16_04 + path: report none_ubuntu_18_04: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-linux-amd64 - make e2e-linux-amd64 - - name: install gopogh - run: | - cd /tmp - GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true - cd - - - name: run integration test - run: | - mkdir -p /tmp/testhome - MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt - - name: generate gopogh report - run: | - export PATH=${PATH}:`go env GOPATH`/bin - go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true - - uses: actions/upload-artifact@v1 - with: - name: none_on_ubuntu_latest_report - path: report + - uses: actions/checkout@v2 + - name: build binaries + run: | + make minikube-linux-amd64 + make e2e-linux-amd64 + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: none_on_ubuntu_latest_report + path: report + + windows_amd_64: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: build binaries + run: | + echo "::add-path::$GOPATH\bin" + make minikube-windows-amd64.exe + make e2e-windows-amd64.exe + - name: install gopogh + run: | + # go get github.com/medyagh/gopogh@v0.0.17 + # cd - + env: + GO111MODULE: on + - name: run integration test + run: | + out/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args="--vm-driver=hyperv --hyperv-virtual-switch=primary-virtual-switch" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=65m + - name: generate gopogh report + run: | + echo "{}" > ./report/testout.json + go tool test2json -t > ./report/testout.json + Get-Content ./report/testout.txt | ./report/testout.json + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ + - uses: actions/upload-artifact@v1 + with: + name: none_on_ubuntu_latest_report + path: report From 5a72ca3ae7446687e2918327894e33d28f2ea396 Mon Sep 17 00:00:00 2001 From: Alonyb Date: Tue, 11 Feb 2020 23:44:32 -0500 Subject: [PATCH 03/26] add new test line --- pkg/minikube/registry/drvs/hyperv/hyperv.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go index 9f15d0c470..72c96f47d3 100644 --- a/pkg/minikube/registry/drvs/hyperv/hyperv.go +++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go @@ -88,7 +88,8 @@ func status() registry.State { // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) defer cancel() - + + exec.CommandContext(ctx, path, "Enable-WindowsOptionalFeature", "-Online", "-FeatureName", "Microsoft-Hyper-V -All") cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online") out, err := cmd.CombinedOutput() if err != nil { From 82bb6b1aa7c278561975f43e724ef28e45ff449c Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 13 Feb 2020 22:01:10 -0500 Subject: [PATCH 04/26] Update hyperv.go --- pkg/minikube/registry/drvs/hyperv/hyperv.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go index 72c96f47d3..f17b9517fe 100644 --- a/pkg/minikube/registry/drvs/hyperv/hyperv.go +++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go @@ -89,7 +89,6 @@ func status() registry.State { ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) defer cancel() - exec.CommandContext(ctx, path, "Enable-WindowsOptionalFeature", "-Online", "-FeatureName", "Microsoft-Hyper-V -All") cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online") out, err := cmd.CombinedOutput() if err != nil { From dbaa6a33251465d77df7dc55c6541ba05ba7aafa Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 22:52:11 -0500 Subject: [PATCH 05/26] add binaries, build stage --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c45087c0cd..5826b943d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,8 @@ jobs: run : | make minikube-linux-amd64 make e2e-linux-amd64 + make minikube-windows-amd64.exe + make e2e-windows-amd64.exe cp -r test/integration/testdata ./out whoami echo github ref $GITHUB_REF From 85cf5154417056575687f8bcd90a670315769c4b Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 22:55:19 -0500 Subject: [PATCH 06/26] add windows stage --- .github/workflows/main.yml | 67 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5826b943d2..2e3cbd6783 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -177,6 +177,73 @@ jobs: echo "--------------------------------------------" numberOfFailures=$(echo $STAT | jq '.NumberOfFail') if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi + docker_windows_NT: + needs: [build_minikube] + env: + TIME_ELAPSED: time + JOB_NAME: "Docker_windows_NT" + COMMIT_STATUS: "" + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Install gopogh + run: | + find ~/ -iname gopogh.exe + echo $GOPATH + echo $GITHUB_WORKSPACE + curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe + ls + find ~/ -iname gopogh.exe + pwd + shell: bash + - name: Download binaries + uses: actions/download-artifact@v1 + with: + name: minikube_binaries + - name: run integration test + continue-on-error: true + run: | + set +euo pipefail + mkdir -p report + mkdir -p testhome + chmod a+x e2e-* + chmod a+x minikube-* + START_TIME=$(date -u +%s) + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + END_TIME=$(date -u +%s) + TIME_ELAPSED=$(($END_TIME-$START_TIME)) + min=$((${TIME_ELAPSED}/60)) + sec=$((${TIME_ELAPSED}%60)) + TIME_ELAPSED="${min} min $sec seconds" + echo ::set-env name=TIME_ELAPSED::${TIME_ELAPSED} + shell: bash + - name: Generate html report + run: | + pwd + ls + echo $GITHUB_WORKSPACE + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + STAT=$(${GITHUB_WORKSPACE}$(DIRSEP)gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}" -details "${GITHUB_SHA}") || true + echo status: ${STAT} + FailNum=$(echo $STAT | jq '.NumberOfFail') + TestsNum=$(echo $STAT | jq '.NumberOfTests') + GOPOGH_RESULT="${JOB_NAME} : completed with ${FailNum} / ${TestsNum} failures in ${TIME_ELAPSED}" + echo ::set-env name=GOPOGH_RESULT::${GOPOGH_RESULT} + echo ::set-env name=STAT::${STAT} + shell: bash + - name: The End Result + run: | + echo ${GOPOGH_RESULT} + echo "--------------------------------------------" + echo $STAT | jq '.FailedTests' || true + echo "--------------------------------------------" + numberOfFailures=$(echo $STAT | jq '.NumberOfFail') + if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi + shell: bash + - uses: actions/upload-artifact@v1 + with: + name: docker_windows_NT + path: minikube_binaries/report none_ubuntu16_04: needs: [build_minikube] env: From 566eb23ccd1ca5549bf0e055b5c2ee362dcb4786 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 22:56:39 -0500 Subject: [PATCH 07/26] add windows report --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e3cbd6783..335deb5aa5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -463,6 +463,15 @@ jobs: run: | mkdir -p all_reports cp -r docker_ubuntu_18_04 ./all_reports/ + - name: download results docker_windows_NT + uses: actions/download-artifact@v1 + with: + name: docker_windows_NT + - name: cp to all_report + shell: bash + run: | + mkdir -p all_reports + cp -r docker_Windows_NT ./all_reports/ - name: download results none_ubuntu16_04 uses: actions/download-artifact@v1 with: From f784001468b3f8e8887dd5aa9b7fe3fb30b0ca26 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 22:57:59 -0500 Subject: [PATCH 08/26] giving some love to windows workflow --- .github/workflows/main.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 335deb5aa5..312058d4ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -186,15 +186,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Install gopogh + - name: Download gopogh run: | - find ~/ -iname gopogh.exe - echo $GOPATH - echo $GITHUB_WORKSPACE curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe - ls - find ~/ -iname gopogh.exe - pwd shell: bash - name: Download binaries uses: actions/download-artifact@v1 From bc619df5bf15c08d405d32358b1819ac7379247c Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 22:59:57 -0500 Subject: [PATCH 09/26] Delete linux stuff --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 312058d4ef..fd85349459 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -200,8 +200,6 @@ jobs: set +euo pipefail mkdir -p report mkdir -p testhome - chmod a+x e2e-* - chmod a+x minikube-* START_TIME=$(date -u +%s) KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) From f3ee969dd1343cf7960cf6d9a66f56b8807c5226 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 23:01:40 -0500 Subject: [PATCH 10/26] it's almost done --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd85349459..373f6e0f13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,11 +211,8 @@ jobs: shell: bash - name: Generate html report run: | - pwd - ls - echo $GITHUB_WORKSPACE go tool test2json -t < ./report/testout.txt > ./report/testout.json || true - STAT=$(${GITHUB_WORKSPACE}$(DIRSEP)gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}" -details "${GITHUB_SHA}") || true + STAT=$(${GITHUB_WORKSPACE}/gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}" -details "${GITHUB_SHA}") || true echo status: ${STAT} FailNum=$(echo $STAT | jq '.NumberOfFail') TestsNum=$(echo $STAT | jq '.NumberOfTests') From bceb07159d4b04d1d5f2bb6ec6a268efeaa80ef6 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 23:03:24 -0500 Subject: [PATCH 11/26] perfect --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 373f6e0f13..9110594ed1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -460,7 +460,7 @@ jobs: shell: bash run: | mkdir -p all_reports - cp -r docker_Windows_NT ./all_reports/ + cp -r docker_windows_NT ./all_reports/ - name: download results none_ubuntu16_04 uses: actions/download-artifact@v1 with: From 24fcd1521997020b323793ff4275f78a0db86ae7 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Sun, 16 Feb 2020 23:07:16 -0500 Subject: [PATCH 12/26] giving some love to makefile --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index c56aa28f09..2f831e01d0 100755 --- a/Makefile +++ b/Makefile @@ -281,9 +281,6 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) endif which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... ifeq ($(OS),Windows_NT) - echo "%cd%" - echo "$(GOPATH)" - dir PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" "$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/... -gofmt -s -w $@ From 9834408c68e23bb1f2a136b8b9dcdce7d6602179 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Mon, 17 Feb 2020 07:43:23 -0500 Subject: [PATCH 13/26] change the order of steps --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9110594ed1..86af8e60f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -220,6 +220,10 @@ jobs: echo ::set-env name=GOPOGH_RESULT::${GOPOGH_RESULT} echo ::set-env name=STAT::${STAT} shell: bash + - uses: actions/upload-artifact@v1 + with: + name: docker_windows_NT + path: minikube_binaries/report - name: The End Result run: | echo ${GOPOGH_RESULT} @@ -229,10 +233,6 @@ jobs: numberOfFailures=$(echo $STAT | jq '.NumberOfFail') if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi shell: bash - - uses: actions/upload-artifact@v1 - with: - name: docker_windows_NT - path: minikube_binaries/report none_ubuntu16_04: needs: [build_minikube] env: From 788402e4db4a82fb3a6b003bd7880464fecc00b7 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Mon, 17 Feb 2020 08:23:54 -0500 Subject: [PATCH 14/26] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86af8e60f5..fb26bd2596 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -223,7 +223,7 @@ jobs: - uses: actions/upload-artifact@v1 with: name: docker_windows_NT - path: minikube_binaries/report + path: report - name: The End Result run: | echo ${GOPOGH_RESULT} From a04239566948347360e3ac8373f87d0c2a0deb53 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Wed, 19 Feb 2020 07:22:57 -0500 Subject: [PATCH 15/26] Update Makefile --- Makefile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Makefile b/Makefile index 2f831e01d0..28d5bc1147 100755 --- a/Makefile +++ b/Makefile @@ -280,15 +280,6 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) endif which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... -ifeq ($(OS),Windows_NT) - PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" - "$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/... - -gofmt -s -w $@ - @#golint: Dns should be DNS (compat sed) - @sed -i -e 's/Dns/DNS/g' $@ && rm -f ./-e - @#golint: Html should be HTML (compat sed) - @sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e -else PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg assets deploy/addons/... -gofmt -s -w $@ @#golint: Dns should be DNS (compat sed) @@ -296,26 +287,15 @@ else @#golint: Html should be HTML (compat sed) @sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e -endif - pkg/minikube/translate/translations.go: $(shell find "translations/" -type f) ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) endif -ifeq ($(OS),Windows_NT) - which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... - PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" - "$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg translate translations/... - -gofmt -s -w $@ - @#golint: Json should be JSON (compat sed) - @sed -i -e 's/Json/JSON/' $@ && rm -f ./-e -else which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/... PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg translate translations/... -gofmt -s -w $@ @#golint: Json should be JSON (compat sed) @sed -i -e 's/Json/JSON/' $@ && rm -f ./-e -endif .PHONY: cross cross: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe ## Build minikube for all platform From 3bccafb66bb644e2a77aaa0da93f20df1cc557d3 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Wed, 19 Feb 2020 20:23:06 -0500 Subject: [PATCH 16/26] Update hyperv.go --- pkg/minikube/registry/drvs/hyperv/hyperv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go index f17b9517fe..9f15d0c470 100644 --- a/pkg/minikube/registry/drvs/hyperv/hyperv.go +++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go @@ -88,7 +88,7 @@ func status() registry.State { // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) defer cancel() - + cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online") out, err := cmd.CombinedOutput() if err != nil { From cd3283d5c8d0777d91a01c6bcd2c9f4cbdc398c2 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 08:18:08 -0500 Subject: [PATCH 17/26] give some love to actions --- .github/workflows/main.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a36dfb1a19..8d6a7f8b82 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,15 +211,21 @@ jobs: echo $STAT | jq '.FailedTests' || true echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi - docker_windows_NT: + docker_windows_shell: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "Docker_windows_NT" + JOB_NAME: "Docker_windows_shell" COMMIT_STATUS: "" runs-on: windows-latest steps: - uses: actions/checkout@v2 + - name: Docker Info + shell: bash + run: | + docker info || true + docker version || true + docker ps || true - name: Download gopogh run: | curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe @@ -235,7 +241,7 @@ jobs: mkdir -p report mkdir -p testhome START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -256,7 +262,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v1 with: - name: docker_windows_NT + name: docker_windows_shell path: report - name: The End Result run: | @@ -265,6 +271,8 @@ jobs: echo "----------------${numFail} Failures----------------------------" echo $STAT | jq '.FailedTests' || true echo "--------------------------------------------" + numPass=$(echo $STAT | jq '.NumberOfPass') + echo "*** $numPass Passed ***" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi shell: bash none_ubuntu16_04: From 1520b592768096fb620e20fce7ba8c97275a8e93 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 08:19:48 -0500 Subject: [PATCH 18/26] update stage name --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8d6a7f8b82..31be5e710c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -499,15 +499,15 @@ jobs: run: | mkdir -p all_reports cp -r docker_ubuntu_18_04 ./all_reports/ - - name: download results docker_windows_NT + - name: download results docker_windows_shell uses: actions/download-artifact@v1 with: - name: docker_windows_NT + name: docker_windows_shell - name: cp to all_report shell: bash run: | mkdir -p all_reports - cp -r docker_windows_NT ./all_reports/ + cp -r docker_windows_shell ./all_reports/ - name: Download Results none_ubuntu16_04 uses: actions/download-artifact@v1 with: From 42a28d014e5167b9ce453a08b4038ecdb4986517 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 08:32:59 -0500 Subject: [PATCH 19/26] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31be5e710c..c6bf2a4574 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -241,7 +241,7 @@ jobs: mkdir -p report mkdir -p testhome START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=docker -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) From 4f1ae0cd4fe50e5ffb924ece8b1b1947966c3c8f Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 08:47:00 -0500 Subject: [PATCH 20/26] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6bf2a4574..4eb9b9706a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -241,7 +241,7 @@ jobs: mkdir -p report mkdir -p testhome START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=docker -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) From da578b8727ef257052e3b77ec19a182083d0fb91 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 21:00:45 -0500 Subject: [PATCH 21/26] change continue on error to false --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4eb9b9706a..f94d59a89b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,7 +100,7 @@ jobs: with: name: minikube_binaries - name: Run Integration Test - continue-on-error: true + continue-on-error: false # bash {0} to allow test to continue to next step. in case of shell: bash {0} run: | From d8cf3339abd9e71f0ce6e2b389327fcc97a85253 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 21:38:07 -0500 Subject: [PATCH 22/26] test old file --- .github/workflows/main.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f94d59a89b..f19cf8b641 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,21 +211,15 @@ jobs: echo $STAT | jq '.FailedTests' || true echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi - docker_windows_shell: + docker_windows_NT: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "Docker_windows_shell" + JOB_NAME: "Docker_windows_NT" COMMIT_STATUS: "" runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Docker Info - shell: bash - run: | - docker info || true - docker version || true - docker ps || true - name: Download gopogh run: | curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe @@ -262,7 +256,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v1 with: - name: docker_windows_shell + name: docker_windows_NT path: report - name: The End Result run: | @@ -271,8 +265,6 @@ jobs: echo "----------------${numFail} Failures----------------------------" echo $STAT | jq '.FailedTests' || true echo "--------------------------------------------" - numPass=$(echo $STAT | jq '.NumberOfPass') - echo "*** $numPass Passed ***" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi shell: bash none_ubuntu16_04: From 0bc5adee14bd5b45ef04b76ac78764719611b79b Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 21:45:22 -0500 Subject: [PATCH 23/26] change to new file --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f19cf8b641..dcdc6d15a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,11 +211,11 @@ jobs: echo $STAT | jq '.FailedTests' || true echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi - docker_windows_NT: + docker_windows_shell: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "Docker_windows_NT" + JOB_NAME: "Docker_windows_shell" COMMIT_STATUS: "" runs-on: windows-latest steps: @@ -256,7 +256,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v1 with: - name: docker_windows_NT + name: docker_windows_shell path: report - name: The End Result run: | @@ -265,6 +265,8 @@ jobs: echo "----------------${numFail} Failures----------------------------" echo $STAT | jq '.FailedTests' || true echo "--------------------------------------------" + numPass=$(echo $STAT | jq '.NumberOfPass') + echo "*** $numPass Passed ***" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi shell: bash none_ubuntu16_04: From b7bcda88180f632eb69050e5863cafa4e573ea69 Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 21:58:39 -0500 Subject: [PATCH 24/26] delete expected-default-driver --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcdc6d15a3..6854bcb1f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -235,7 +235,7 @@ jobs: mkdir -p report mkdir -p testhome START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) From 5466cbf4ac1b1ad09713e21d64f5a0340b67a51a Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Thu, 26 Mar 2020 22:10:17 -0500 Subject: [PATCH 25/26] rename the stage --- .github/workflows/main.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6854bcb1f2..cd3d6844fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,15 +211,21 @@ jobs: echo $STAT | jq '.FailedTests' || true echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi - docker_windows_shell: + docker_on_windows: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "Docker_windows_shell" + JOB_NAME: "Docker_on_windows" COMMIT_STATUS: "" runs-on: windows-latest steps: - uses: actions/checkout@v2 + - name: Docker Info + shell: bash + run: | + docker info || true + docker version || true + docker ps || true - name: Download gopogh run: | curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe @@ -256,7 +262,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v1 with: - name: docker_windows_shell + name: docker_on_windows path: report - name: The End Result run: | @@ -493,15 +499,15 @@ jobs: run: | mkdir -p all_reports cp -r docker_ubuntu_18_04 ./all_reports/ - - name: download results docker_windows_shell + - name: download results docker_on_windows uses: actions/download-artifact@v1 with: - name: docker_windows_shell + name: docker_on_windows - name: cp to all_report shell: bash run: | mkdir -p all_reports - cp -r docker_windows_shell ./all_reports/ + cp -r docker_on_windows ./all_reports/ - name: Download Results none_ubuntu16_04 uses: actions/download-artifact@v1 with: From 7c9068c991fcb5b80fb22a59984c219817f9a56d Mon Sep 17 00:00:00 2001 From: Ruben Baez Date: Fri, 27 Mar 2020 08:53:49 -0500 Subject: [PATCH 26/26] change driver --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cd3d6844fc..168b01261e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -241,7 +241,7 @@ jobs: mkdir -p report mkdir -p testhome START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60))