Skip to content

Commit 3bb1a57

Browse files
authored
upload "per commit" logs for integration test (#6609)
* make set logs URLs per commit * add logs per commit to commit status * logs per commit * add per commit logs for windows too * fix windows test script virtualbox * fix windows script * forget about windows for now it errors * fix pending script * fix typo pending script
1 parent 4c6b435 commit 3bb1a57

4 files changed

+9
-2
lines changed

hack/jenkins/common.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ min=$(($elapsed/60))
308308
sec=$(tail -c 3 <<< $((${elapsed}00/60)))
309309
elapsed=$min.$sec
310310

311-
JOB_GCS_BUCKET="minikube-builds/logs/${MINIKUBE_LOCATION}/${JOB_NAME}"
311+
SHORT_COMMIT=${COMMIT:0:7}
312+
JOB_GCS_BUCKET="minikube-builds/logs/${MINIKUBE_LOCATION}/${SHORT_COMMIT}/${JOB_NAME}"
312313
echo ">> Copying ${TEST_OUT} to gs://${JOB_GCS_BUCKET}out.txt"
313314
gsutil -qm cp "${TEST_OUT}" "gs://${JOB_GCS_BUCKET}out.txt"
314315

@@ -345,6 +346,7 @@ gsutil -qm cp "${JSON_OUT}" "gs://${JOB_GCS_BUCKET}.json" || true
345346
echo ">> uploading ${HTML_OUT}"
346347
gsutil -qm cp "${HTML_OUT}" "gs://${JOB_GCS_BUCKET}.html" || true
347348

349+
348350
public_log_url="https://storage.googleapis.com/${JOB_GCS_BUCKET}.txt"
349351
if grep -q html "$HTML_OUT"; then
350352
public_log_url="https://storage.googleapis.com/${JOB_GCS_BUCKET}.html"

hack/jenkins/minikube_set_pending.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ function retry_github_status() {
7878
done
7979
}
8080

81+
SHORT_COMMIT=${ghprbActualCommit:0:7}
8182
for j in ${jobs[@]}; do
8283
retry_github_status "${ghprbActualCommit}" "${j}" "pending" "${access_token}" \
83-
"https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${j}.pending"
84+
"https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${SHORT_COMMIT}/${j}.pending"
8485
done
8586

hack/jenkins/windows_integration_test_hyperv.ps1

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ $env:result=$lastexitcode
2525
If($env:result -eq 0){$env:status="success"}
2626
Else {$env:status="failure"}
2727

28+
# $env:SHORT_COMMIT=$env:COMMIT.substring(0, 7)
29+
# to be used later to implement https://github.com/kubernetes/minikube/issues/6593
2830
$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Hyper-V_Windows.txt"
2931
$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Hyper-V_Windows`"}"
3032
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

hack/jenkins/windows_integration_test_virtualbox.ps1

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ $env:result=$lastexitcode
2525
If($env:result -eq 0){$env:status="success"}
2626
Else {$env:status="failure"}
2727

28+
# $env:SHORT_COMMIT=$env:COMMIT.substring(0, 7)
29+
# to be used later
2830
$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/VirtualBox_Windows.txt"
2931
$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"VirtualBox_Windows`"}"
3032
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

0 commit comments

Comments
 (0)