github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31478 from david-mcmahon/fix-cache-gen

Browse Source 
Automatic merge from submit-queue

Fix the creation of the jobResultsCache.json file.

Let's try this again.
ref https://github.com/kubernetes/release/pull/60
This commit is contained in:
Kubernetes Submit Queue 2016-08-25 18:33:52 -07:00 committed by GitHub
commit 3af6ad1c33
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/jenkins/upload-to-gcs.sh
View File

@ -156,23 +156,23 @@ function update_job_result_cache() {
for upload_attempt in $(seq 3); do
echo "Copying ${job_results} to ${tmp_results} (attempt ${upload_attempt})"
# The sed construct below is stripping out only the "version" lines
# and then ensuring there's a single comma at the end of the line.
gsutil -q cat ${job_results} 2>&- |\
sed -n 's/^\({"version".*}\),*/\1,/p' >> ${tmp_results} || continue
sed -n 's/^\({"version".*}\),*/\1,/p' |\
tail -${cache_size} >> ${tmp_results} || continue
break
done
echo "{\"version\": \"${version}\", \"buildnumber\": \"${BUILD_NUMBER}\"," \
"\"result\": \"${build_result}\"}" >> ${tmp_results}
# JSON doesn't like terminating elements to contain a "," separator, so
# terminate the elements with an empty one.
echo -e "{}\n]" >> ${tmp_results}
echo "]" >> ${tmp_results}
for upload_attempt in $(seq 3); do
echo "Copying ${tmp_results} to ${job_results} (attempt ${upload_attempt})"
gsutil -q -h "Content-Type:application/json" cp -a "${gcs_acl}" \
<(tail -${cache_size} ${tmp_results}) ${job_results} || continue
${tmp_results} ${job_results} || continue
break
done