提交 5efde8bf 编写于 作者: T Thomas Stromberg

The PR field is actually the commit field

上级 f69498ca
...@@ -293,11 +293,9 @@ if [[ "${MINIKUBE_LOCATION}" == "master" ]]; then ...@@ -293,11 +293,9 @@ if [[ "${MINIKUBE_LOCATION}" == "master" ]]; then
exit $result exit $result
fi fi
set -x
# retry_github_status provides reliable github status updates # retry_github_status provides reliable github status updates
function retry_github_status() { function retry_github_status() {
local pr=$1 local commit=$1
local context=$2 local context=$2
local state=$3 local state=$3
local token=$4 local token=$4
...@@ -311,7 +309,7 @@ function retry_github_status() { ...@@ -311,7 +309,7 @@ function retry_github_status() {
while [[ "${attempt}" -lt 8 ]]; do while [[ "${attempt}" -lt 8 ]]; do
local out=$(mktemp) local out=$(mktemp)
code=$(curl -o "${out}" -s --write-out "%{http_code}" -L \ code=$(curl -o "${out}" -s --write-out "%{http_code}" -L \
"https://api.github.com/repos/kubernetes/minikube/statuses/${pr}?access_token=${token}" \ "https://api.github.com/repos/kubernetes/minikube/statuses/${commit}?access_token=${token}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-X POST \ -X POST \
-d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999) -d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999)
...@@ -329,5 +327,5 @@ function retry_github_status() { ...@@ -329,5 +327,5 @@ function retry_github_status() {
done done
} }
retry_github_status "${MINIKUBE_LOCATION}" "${JOB_NAME}" "${status}" "${access_token}" "https://storage.googleapis.com/minikube-builds/logs/${MINIKUBE_LOCATION}/${JOB_NAME}.txt" retry_github_status "${COMMIT}" "${JOB_NAME}" "${status}" "${access_token}" "https://storage.googleapis.com/minikube-builds/logs/${MINIKUBE_LOCATION}/${JOB_NAME}.txt"
exit $result exit $result
...@@ -44,7 +44,7 @@ jobs=( ...@@ -44,7 +44,7 @@ jobs=(
# retry_github_status provides reliable github status updates # retry_github_status provides reliable github status updates
function retry_github_status() { function retry_github_status() {
local pr=$1 local commit=$1
local context=$2 local context=$2
local state=$3 local state=$3
local token=$4 local token=$4
...@@ -58,7 +58,7 @@ function retry_github_status() { ...@@ -58,7 +58,7 @@ function retry_github_status() {
while [[ "${attempt}" -lt 8 ]]; do while [[ "${attempt}" -lt 8 ]]; do
local out=$(mktemp) local out=$(mktemp)
code=$(curl -o "${out}" -s --write-out "%{http_code}" -L \ code=$(curl -o "${out}" -s --write-out "%{http_code}" -L \
"https://api.github.com/repos/kubernetes/minikube/statuses/${pr}?access_token=${token}" \ "https://api.github.com/repos/kubernetes/minikube/statuses/${commit}?access_token=${token}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-X POST \ -X POST \
-d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999) -d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999)
...@@ -76,7 +76,6 @@ function retry_github_status() { ...@@ -76,7 +76,6 @@ function retry_github_status() {
done done
} }
for j in ${jobs[@]}; do for j in ${jobs[@]}; do
retry_github_status "${ghprbActualCommit}" "${j}" "pending" "${access_token}" \ retry_github_status "${ghprbActualCommit}" "${j}" "pending" "${access_token}" \
"https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${j}.txt" "https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${j}.txt"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册