bump gopogh and attempt to fix windows script

pull/6081/head
Medya Gh 2019-12-19 22:21:02 -08:00
parent f1933f44dd
commit b4e43bbfe6
3 changed files with 19 additions and 12 deletions

View File

@ -321,7 +321,7 @@ touch "${JSON_OUT}"
echo ">> Running go test2json" echo ">> Running go test2json"
go tool test2json -t < "${TEST_OUT}" > "${JSON_OUT}" || true go tool test2json -t < "${TEST_OUT}" > "${JSON_OUT}" || true
echo ">> Installing gopogh" echo ">> Installing gopogh"
GO111MODULE="on" go get -u github.com/medyagh/gopogh@v0.0.15 || true GO111MODULE="on" go get -u github.com/medyagh/gopogh@v0.0.16 || true
echo ">> Running gopogh" echo ">> Running gopogh"
if test -f "${HTML_OUT}"; then if test -f "${HTML_OUT}"; then
rm "${HTML_OUT}" || true # clean up previous runs of same build rm "${HTML_OUT}" || true # clean up previous runs of same build

View File

@ -17,26 +17,24 @@ gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/minikube-windows-am
gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe out/ gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe out/
gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
./out/minikube-windows-amd64.exe delete ./out/minikube-windows-amd64.exe delete --all --purge
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 > ./out/test.out 2>&1 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 > ./out/test.out 2>&1
$env:result=$lastexitcode $env:result=$lastexitcode
# If the last exit code was 0->success, x>0->error # If the last exit code was 0->success, x>0->error
If($env:result -eq 0){$env:status="success"} If($env:result -eq 0){$env:status="success"}
Else {$env:status="failure"} Else {$env:status="failure"}
type nul > out/test.json
# generate json output using go tool test2json # generate json output using go tool test2json
go tool test2json -t < ./out/test.out > ./out/test.json cmd /c 'go tool test2json -t < ./out/test.out > ./out/test.json'
GO111MODULE="on" go get -u "github.com/medyagh/gopogh@v0.0.15" $env:GO111MODULE='on'
go get -u "github.com/medyagh/gopogh@v0.0.16"
type nul > out/test.html # touch
# Generate html report # Generate html report
gopogh -in ./out/test.json -out ./out/test.html -name $env:JOB_NAME -pr $env:MINIKUBE_LOCATION -repo github.com/kubernetes/minikube/ -details $env:COMMIT gopogh -in ./out/test.json -out ./out/test.html -name $env:JOB_NAME -pr $env:MINIKUBE_LOCATION -repo github.com/kubernetes/minikube/ -details $env:COMMIT
gsutil -qm cp ./out/test.json "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.json" gsutil -qm cp ./out/test.json "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.json"
gsutil -qm cp ./out/test.html "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.html" gsutil -qm cp ./out/test.html "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.html"
$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Hyper-V_Windows.txt" $env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.html"
$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Hyper-V_Windows`"}" $json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Hyper-V_Windows`"}"
Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing

View File

@ -17,15 +17,24 @@ gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/minikube-windows-am
gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe out/ gsutil.cmd -m cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe out/
gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
./out/minikube-windows-amd64.exe delete ./out/minikube-windows-amd64.exe delete --all --purge
out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox" -expected-default-driver=hyperv -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=60m > ./out/test.out 2>&1
out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox" -expected-default-driver=hyperv -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
$env:result=$lastexitcode $env:result=$lastexitcode
# If the last exit code was 0->success, x>0->error # If the last exit code was 0->success, x>0->error
If($env:result -eq 0){$env:status="success"} If($env:result -eq 0){$env:status="success"}
Else {$env:status="failure"} Else {$env:status="failure"}
$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/VirtualBox_Windows.txt" # generate json output using go tool test2json
cmd /c 'go tool test2json -t < ./out/test.out > ./out/test.json'
$env:GO111MODULE='on'
go get -u "github.com/medyagh/gopogh@v0.0.16"
# Generate html report
gopogh -in ./out/test.json -out ./out/test.html -name $env:JOB_NAME -pr $env:MINIKUBE_LOCATION -repo github.com/kubernetes/minikube/ -details $env:COMMIT
gsutil -qm cp ./out/test.json "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.json"
gsutil -qm cp ./out/test.html "gs://minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.html"
$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:JOB_NAME.html"
$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"VirtualBox_Windows`"}" $json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"VirtualBox_Windows`"}"
Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing