The PR field is actually the commit field

kubernetes · Nov 12, 2019 · 5efde8b · 5efde8b
1 parent f69498c
commit 5efde8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
@@ -293,11 +293,9 @@ if [[ "${MINIKUBE_LOCATION}" == "master" ]]; then
   exit $result
 fi
 
-set -x
-
 # retry_github_status provides reliable github status updates
 function retry_github_status() {
-  local pr=$1
+  local commit=$1
   local context=$2
   local state=$3
   local token=$4
@@ -311,7 +309,7 @@ function retry_github_status() {
   while [[ "${attempt}" -lt 8 ]]; do
     local out=$(mktemp)
     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" \
       -X POST \
       -d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999)
@@ -329,5 +327,5 @@ function retry_github_status() {
   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
diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh
@@ -44,7 +44,7 @@ jobs=(
 
 # retry_github_status provides reliable github status updates
 function retry_github_status() {
-  local pr=$1
+  local commit=$1
   local context=$2
   local state=$3
   local token=$4
@@ -58,7 +58,7 @@ function retry_github_status() {
   while [[ "${attempt}" -lt 8 ]]; do
     local out=$(mktemp)
     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" \
       -X POST \
       -d "{\"state\": \"${state}\", \"description\": \"Jenkins\", \"target_url\": \"${target}\", \"context\": \"${context}\"}" || echo 999)
@@ -76,7 +76,6 @@ function retry_github_status() {
   done
 }
 
-
 for j in ${jobs[@]}; do
   retry_github_status "${ghprbActualCommit}" "${j}" "pending" "${access_token}" \
     "https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${j}.txt"