Created
September 26, 2018 18:06
-
-
Save sttts/f34e44064e6fe914b150ce6bcc502d00 to your computer and use it in GitHub Desktop.
This file has been truncated, but you can view the full file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [24 Sep 18 07:07 UTC]: Successfully ensured /go-workspace/src/k8s.io/code-generator exists | |
| [24 Sep 18 07:07 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 07:07 UTC]: /publish_scripts/construct.sh code-generator master master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=code-generator | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/code-generator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/code-generator master master '' '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit aae79feb89bdded3679da91fd8c19b6dfcbdb79a. | |
| + echo 'Starting at existing master commit aae79feb89bdded3679da91fd8c19b6dfcbdb79a.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + '[' -z b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb ']' | |
| ++ git-find-merge b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb upstream/master | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb^1..upstream/master' --first-parent | |
| +++ git rev-list b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb..upstream/master --ancestry-path | |
| +++ git rev-parse b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + local k_base_merge=b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + '[' -z b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb ']' | |
| + git branch -f filtered-branch-base b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/code-generator. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/code-generator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/code-generator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| Running git filter-branch ... | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/code-generator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=0aecd14c539d69150c5c4b198ea78c7993e17a37 | |
| ++ git log --first-parent --format=%H --reverse 0aecd14c539d69150c5c4b198ea78c7993e17a37..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' aae79feb89bdded3679da91fd8c19b6dfcbdb79a '!=' aae79feb89bdded3679da91fd8c19b6dfcbdb79a ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io false Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + '[' -z b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb ']' | |
| ++ git-find-merge b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb^1..upstream-branch' --first-parent | |
| +++ git rev-list b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb..upstream-branch --ancestry-path | |
| +++ git rev-parse b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + local k_last_kube_merge=b5ae4498bc7df2d9a9f8a17e8803b3524ea09ffb | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Godeps.json hasn't changed! | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + echo 'Remove redundant godep commits on-top of aae79feb89bdded3679da91fd8c19b6dfcbdb79a.' | |
| + git reset --soft -q aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| Remove redundant godep commits on-top of aae79feb89bdded3679da91fd8c19b6dfcbdb79a. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + local repo=code-generator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'aae79fe Merge pull request #67655 from sttts/sttts-apiextensions-apiserver-codegen-script' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-code-generator-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-code-generator-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-code-generator-master.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' aae79feb89bdded3679da91fd8c19b6dfcbdb79a '!=' aae79feb89bdded3679da91fd8c19b6dfcbdb79a ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 07:09 UTC]: Successfully constructed master | |
| [24 Sep 18 07:09 UTC]: /publish_scripts/construct.sh code-generator release-1.9 release-1.9 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=code-generator | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/code-generator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Running garbage collection. | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| Cleaning up checkout. | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/code-generator release-1.9 release-1.9 '' '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 11 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit 0ab89e584187c20cc7c1a3f30db69f3b4ab64196. | |
| + echo 'Starting at existing release-1.9 commit 0ab89e584187c20cc7c1a3f30db69f3b4ab64196.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ head -n 1 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| ++ git-find-merge 8d48604c2eca912159636be258a5e68bfc4c6643 upstream/release-1.9 | |
| ++ tail -1 | |
| +++ git rev-list '8d48604c2eca912159636be258a5e68bfc4c6643^1..upstream/release-1.9' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 8d48604c2eca912159636be258a5e68bfc4c6643..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local k_base_merge=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| + git branch -f filtered-branch-base 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/code-generator. | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/code-generator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/code-generator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Running git filter-branch ... | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/code-generator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=a964b60f06fcd4028c89f0921c34127ea4441ec7 | |
| ++ git log --first-parent --format=%H --reverse a964b60f06fcd4028c89f0921c34127ea4441ec7..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 '!=' 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io false Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| ++ git-find-merge 8d48604c2eca912159636be258a5e68bfc4c6643 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '8d48604c2eca912159636be258a5e68bfc4c6643^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 8d48604c2eca912159636be258a5e68bfc4c6643..upstream-branch --ancestry-path | |
| +++ git rev-parse 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local k_last_kube_merge=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Godeps.json hasn't changed! | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + echo 'Remove redundant godep commits on-top of 0ab89e584187c20cc7c1a3f30db69f3b4ab64196.' | |
| + git reset --soft -q 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| Remove redundant godep commits on-top of 0ab89e584187c20cc7c1a3f30db69f3b4ab64196. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + local repo=code-generator | |
| ++ head -n 1 | |
| ++ git log --oneline --first-parent --merges | |
| + '[' -n '0ab89e5 Merge pull request #63626 from roycaihw/release-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-code-generator-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-code-generator-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-code-generator-release-1.9.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 '!=' 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 07:10 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 07:10 UTC]: /publish_scripts/construct.sh code-generator release-1.10 release-1.10 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=code-generator | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/code-generator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/code-generator release-1.10 release-1.10 '' '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 14 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit 9de8e796a74d16d2a285165727d04c185ebca6dc. | |
| + echo 'Starting at existing release-1.10 commit 9de8e796a74d16d2a285165727d04c185ebca6dc.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + '[' -z 8959a0aa87adf07c4ff821bf6d79714b3d615e8a ']' | |
| ++ git-find-merge 8959a0aa87adf07c4ff821bf6d79714b3d615e8a upstream/release-1.10 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '8959a0aa87adf07c4ff821bf6d79714b3d615e8a^1..upstream/release-1.10' --first-parent | |
| +++ git rev-list 8959a0aa87adf07c4ff821bf6d79714b3d615e8a..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse 8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + local k_base_merge=8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + '[' -z 8959a0aa87adf07c4ff821bf6d79714b3d615e8a ']' | |
| + git branch -f filtered-branch-base 8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/code-generator. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/code-generator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/code-generator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| Running git filter-branch ... | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/code-generator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=fe40e032bcfe504e871c80cf0ca8de994ab45668 | |
| ++ git log --first-parent --format=%H --reverse fe40e032bcfe504e871c80cf0ca8de994ab45668..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 9de8e796a74d16d2a285165727d04c185ebca6dc '!=' 9de8e796a74d16d2a285165727d04c185ebca6dc ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io false Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + '[' -z 8959a0aa87adf07c4ff821bf6d79714b3d615e8a ']' | |
| ++ git-find-merge 8959a0aa87adf07c4ff821bf6d79714b3d615e8a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '8959a0aa87adf07c4ff821bf6d79714b3d615e8a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 8959a0aa87adf07c4ff821bf6d79714b3d615e8a..upstream-branch --ancestry-path | |
| +++ git rev-parse 8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + local k_last_kube_merge=8959a0aa87adf07c4ff821bf6d79714b3d615e8a | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| Remove redundant godep commits on-top of 9de8e796a74d16d2a285165727d04c185ebca6dc. | |
| + echo 'Remove redundant godep commits on-top of 9de8e796a74d16d2a285165727d04c185ebca6dc.' | |
| + git reset --soft -q 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + local repo=code-generator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '9de8e79 Merge pull request #63448 from dims/automated-cherry-pick-of-#62505-upstream-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-code-generator-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-code-generator-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-code-generator-release-1.10.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' 9de8e796a74d16d2a285165727d04c185ebca6dc '!=' 9de8e796a74d16d2a285165727d04c185ebca6dc ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 07:11 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 07:11 UTC]: /publish_scripts/construct.sh code-generator release-1.11 release-1.11 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=code-generator | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/code-generator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/code-generator release-1.11 release-1.11 '' '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit 8c97d6ab64da020f8b151e9d3ed8af3172f5c390. | |
| + echo 'Starting at existing release-1.11 commit 8c97d6ab64da020f8b151e9d3ed8af3172f5c390.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/code-generator. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/code-generator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/code-generator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/code-generator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=f90d6bb553c4b2e7b5d3d7f13aa132e5e49249d0 | |
| ++ git log --first-parent --format=%H --reverse f90d6bb553c4b2e7b5d3d7f13aa132e5e49249d0..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 '!=' 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io false Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| Remove redundant godep commits on-top of 8c97d6ab64da020f8b151e9d3ed8af3172f5c390. | |
| + echo 'Remove redundant godep commits on-top of 8c97d6ab64da020f8b151e9d3ed8af3172f5c390.' | |
| + git reset --soft -q 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + local repo=code-generator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '8c97d6a Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-code-generator-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-code-generator-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-code-generator-release-1.11.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 '!=' 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 07:12 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 07:12 UTC]: /publish_scripts/construct.sh code-generator release-1.12 release-1.12 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=code-generator | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/code-generator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/code-generator release-1.12 release-1.12 '' '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 3dcf91f64f638563e5106f21f50c31fa361c918d. | |
| + echo 'Starting at existing release-1.12 commit 3dcf91f64f638563e5106f21f50c31fa361c918d.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + '[' -z 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 ']' | |
| ++ git-find-merge 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list '5f6008cadc6e03bf1c84cae2ef4c239d2a111006^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5f6008cadc6e03bf1c84cae2ef4c239d2a111006..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + local k_base_merge=5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + '[' -z 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 ']' | |
| + git branch -f filtered-branch-base 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/code-generator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/code-generator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/code-generator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/code-generator. | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/code-generator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=0aecd14c539d69150c5c4b198ea78c7993e17a37 | |
| ++ git log --first-parent --format=%H --reverse 0aecd14c539d69150c5c4b198ea78c7993e17a37..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 3dcf91f64f638563e5106f21f50c31fa361c918d '!=' 3dcf91f64f638563e5106f21f50c31fa361c918d ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io false Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + '[' -z 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 ']' | |
| ++ git-find-merge 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '5f6008cadc6e03bf1c84cae2ef4c239d2a111006^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5f6008cadc6e03bf1c84cae2ef4c239d2a111006..upstream-branch --ancestry-path | |
| +++ git rev-parse 5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + local k_last_kube_merge=5f6008cadc6e03bf1c84cae2ef4c239d2a111006 | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| Remove redundant godep commits on-top of 3dcf91f64f638563e5106f21f50c31fa361c918d. | |
| + echo 'Remove redundant godep commits on-top of 3dcf91f64f638563e5106f21f50c31fa361c918d.' | |
| + git reset --soft -q 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/code-generator | |
| + local repo=code-generator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'bfb675c Merge pull request #67655 from sttts/sttts-apiextensions-apiserver-codegen-script' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-code-generator-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-code-generator-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-code-generator-release-1.12.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Tagging bfb675c80be2ffc2672b7aee5e8cee835cacc34f as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 3dcf91f64f638563e5106f21f50c31fa361c918d '!=' 3dcf91f64f638563e5106f21f50c31fa361c918d ']' | |
| + git checkout release-1.12 | |
| Already on 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 07:13 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 07:13 UTC]: Successfully ensured /go-workspace/src/k8s.io/apimachinery exists | |
| [24 Sep 18 07:13 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 07:13 UTC]: /publish_scripts/construct.sh apimachinery master master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apimachinery kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apimachinery | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apimachinery | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apimachinery master master '' '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 10 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit 99c5fa21f87204c2875a7f7ba977895d79b35c44. | |
| + echo 'Starting at existing master commit 99c5fa21f87204c2875a7f7ba977895d79b35c44.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream/master --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_base_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| + git branch -f filtered-branch-base 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/apimachinery. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/apimachinery.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apimachinery 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| Running git filter-branch ... | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apimachinery -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=08284ccdae107c19c0d2cf2d4fa80c6c21b1d137 | |
| ++ git log --first-parent --format=%H --reverse 08284ccdae107c19c0d2cf2d4fa80c6c21b1d137..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 99c5fa21f87204c2875a7f7ba977895d79b35c44 '!=' 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io true Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream-branch --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_last_kube_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + echo 'Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library.' | |
| + rm -rf ./vendor/github.com/golang/glog | |
| Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library. | |
| + rm -rf ./vendor/k8s.io | |
| + rm -rf ./vendor/github.com/google/gofuzz | |
| + rm -rf ./vendor/github.com/go-openapi | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| Godeps.json hasn't changed! | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| Remove redundant godep commits on-top of 99c5fa21f87204c2875a7f7ba977895d79b35c44. | |
| + echo 'Remove redundant godep commits on-top of 99c5fa21f87204c2875a7f7ba977895d79b35c44.' | |
| + git reset --soft -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + local repo=apimachinery | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-master | |
| + '[' -n '99c5fa2 Merge pull request #68442 from CaoShuFeng/json-patch' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-master' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apimachinery-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apimachinery-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-apimachinery-master.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' 99c5fa21f87204c2875a7f7ba977895d79b35c44 '!=' 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 07:15 UTC]: Successfully constructed master | |
| [24 Sep 18 07:15 UTC]: /publish_scripts/construct.sh apimachinery release-1.9 release-1.9 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apimachinery kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apimachinery | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apimachinery | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apimachinery release-1.9 release-1.9 '' '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 7 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit fb40df2b502912cbe3a93aa61c2b2487f39cb42f. | |
| + echo 'Starting at existing release-1.9 commit fb40df2b502912cbe3a93aa61c2b2487f39cb42f.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream/release-1.9 | |
| ++ tail -1 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream/release-1.9' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_base_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| + git branch -f filtered-branch-base f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apimachinery. | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apimachinery.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apimachinery 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| Running git filter-branch ... | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apimachinery -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=52db9fd292435c7e717dda8014164a0730819225 | |
| ++ git log --first-parent --format=%H --reverse 52db9fd292435c7e717dda8014164a0730819225..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' fb40df2b502912cbe3a93aa61c2b2487f39cb42f '!=' fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io true Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream-branch --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_last_kube_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| Remove redundant godep commits on-top of fb40df2b502912cbe3a93aa61c2b2487f39cb42f. | |
| + echo 'Remove redundant godep commits on-top of fb40df2b502912cbe3a93aa61c2b2487f39cb42f.' | |
| + git reset --soft -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + local repo=apimachinery | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'fb40df2 Merge pull request #65298 from nikhita/cherrypick-jsoniter-bump-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apimachinery-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apimachinery-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-apimachinery-release-1.9.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' fb40df2b502912cbe3a93aa61c2b2487f39cb42f '!=' fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 07:17 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 07:17 UTC]: /publish_scripts/construct.sh apimachinery release-1.10 release-1.10 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apimachinery kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apimachinery | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apimachinery | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apimachinery release-1.10 release-1.10 '' '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| e386b2658ed20923da8cc9250e552f082899a1ee | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 8 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit e386b2658ed20923da8cc9250e552f082899a1ee. | |
| + echo 'Starting at existing release-1.10 commit e386b2658ed20923da8cc9250e552f082899a1ee.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream/release-1.10 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream/release-1.10' --first-parent | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local k_base_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| + git branch -f filtered-branch-base 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apimachinery. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apimachinery.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apimachinery 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| Running git filter-branch ... | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apimachinery -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=cc2c98bc68826b762c838cfedf3c48e72c24da8d | |
| ++ git log --first-parent --format=%H --reverse cc2c98bc68826b762c838cfedf3c48e72c24da8d..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=e386b2658ed20923da8cc9250e552f082899a1ee | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=e386b2658ed20923da8cc9250e552f082899a1ee | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' e386b2658ed20923da8cc9250e552f082899a1ee '!=' e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=e386b2658ed20923da8cc9250e552f082899a1ee | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io true Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream-branch' --first-parent | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream-branch --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local k_last_kube_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-1.10 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code e386b2658ed20923da8cc9250e552f082899a1ee | |
| Remove redundant godep commits on-top of e386b2658ed20923da8cc9250e552f082899a1ee. | |
| + echo 'Remove redundant godep commits on-top of e386b2658ed20923da8cc9250e552f082899a1ee.' | |
| + git reset --soft -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + local repo=apimachinery | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.10 | |
| + '[' -n 'e386b26 Merge pull request #65157 from caesarxuchao/cherrypick-65034-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.10' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=e386b2658ed20923da8cc9250e552f082899a1ee | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apimachinery-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apimachinery-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-apimachinery-release-1.10.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' e386b2658ed20923da8cc9250e552f082899a1ee '!=' e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 07:18 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 07:18 UTC]: /publish_scripts/construct.sh apimachinery release-1.11 release-1.11 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apimachinery kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apimachinery | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apimachinery | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| Cleaning up checkout. | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apimachinery release-1.11 release-1.11 '' '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| def12e63c512da17043b4f0293f52d1006603d9f | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 9 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit def12e63c512da17043b4f0293f52d1006603d9f. | |
| + echo 'Starting at existing release-1.11 commit def12e63c512da17043b4f0293f52d1006603d9f.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apimachinery. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apimachinery.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apimachinery 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| Running git filter-branch ... | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apimachinery -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=790146089d8a012ca7f30942ba1a41e39d35d31c | |
| ++ git log --first-parent --format=%H --reverse 790146089d8a012ca7f30942ba1a41e39d35d31c..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=def12e63c512da17043b4f0293f52d1006603d9f | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=def12e63c512da17043b4f0293f52d1006603d9f | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| Fixing up godeps after a complete sync | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' def12e63c512da17043b4f0293f52d1006603d9f '!=' def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=def12e63c512da17043b4f0293f52d1006603d9f | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io true Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| Godeps.json hasn't changed! | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code def12e63c512da17043b4f0293f52d1006603d9f | |
| Remove redundant godep commits on-top of def12e63c512da17043b4f0293f52d1006603d9f. | |
| + echo 'Remove redundant godep commits on-top of def12e63c512da17043b4f0293f52d1006603d9f.' | |
| + git reset --soft -q def12e63c512da17043b4f0293f52d1006603d9f | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + local repo=apimachinery | |
| ++ head -n 1 | |
| ++ git log --oneline --first-parent --merges | |
| + '[' -n 'def12e6 Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=def12e63c512da17043b4f0293f52d1006603d9f | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apimachinery-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apimachinery-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-apimachinery-release-1.11.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' def12e63c512da17043b4f0293f52d1006603d9f '!=' def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 07:20 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 07:20 UTC]: /publish_scripts/construct.sh apimachinery release-1.12 release-1.12 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apimachinery kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apimachinery | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS= | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apimachinery | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q def12e63c512da17043b4f0293f52d1006603d9f | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apimachinery release-1.12 release-1.12 '' '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 9 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 6dd46049f39503a1fc8d65de4bd566829e95faff. | |
| + echo 'Starting at existing release-1.12 commit 6dd46049f39503a1fc8d65de4bd566829e95faff.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream/release-1.12 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream/release-1.12' --first-parent | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_base_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| + git branch -f filtered-branch-base a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apimachinery. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apimachinery.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apimachinery 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apimachinery | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apimachinery -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=08284ccdae107c19c0d2cf2d4fa80c6c21b1d137 | |
| ++ git log --first-parent --format=%H --reverse 08284ccdae107c19c0d2cf2d4fa80c6c21b1d137..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 6dd46049f39503a1fc8d65de4bd566829e95faff '!=' 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + '[' false = true ']' | |
| + fix-godeps '' '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps= | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + '[' true = true ']' | |
| + update_full_godeps '' k8s.io true Kubernetes-commit | |
| + local deps= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit '' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream-branch' --first-parent | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream-branch --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_last_kube_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local dep_count=0 | |
| + (( i=0 )) | |
| + (( i<0 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + echo 'Remove redundant godep commits on-top of 6dd46049f39503a1fc8d65de4bd566829e95faff.' | |
| + git reset --soft -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| Remove redundant godep commits on-top of 6dd46049f39503a1fc8d65de4bd566829e95faff. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apimachinery | |
| + local repo=apimachinery | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '6dd4604 Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apimachinery-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apimachinery-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apimachinery-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-apimachinery-release-1.12.sh --dependencies '' -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Tagging 705814234c8085247e99946887b0fbbd801efa08 as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 6dd46049f39503a1fc8d65de4bd566829e95faff '!=' 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + git checkout release-1.12 | |
| Already on 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 07:22 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 07:22 UTC]: Successfully ensured /go-workspace/src/k8s.io/api exists | |
| [24 Sep 18 07:22 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 07:22 UTC]: /publish_scripts/construct.sh api master master apimachinery:master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/api kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=api | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/api | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| Cleaning up checkout. | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/api master master apimachinery:master '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| f456898a08e4bbc5891694118f3819f324de12ff | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 28 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit f456898a08e4bbc5891694118f3819f324de12ff. | |
| + echo 'Starting at existing master commit f456898a08e4bbc5891694118f3819f324de12ff.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + '[' -z 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 ']' | |
| ++ git-find-merge 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '020b1d5ff58419226ef6ae5fc556a05a42bb1e44^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 020b1d5ff58419226ef6ae5fc556a05a42bb1e44..upstream/master --ancestry-path | |
| +++ git rev-parse 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + local k_base_merge=020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + '[' -z 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 ']' | |
| + git branch -f filtered-branch-base 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/api. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/api.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/api 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/api -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=7914848d832b209a5f9124adb49438d9797a7a47 | |
| ++ git log --first-parent --format=%H --reverse 7914848d832b209a5f9124adb49438d9797a7a47..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=f456898a08e4bbc5891694118f3819f324de12ff | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' f456898a08e4bbc5891694118f3819f324de12ff '!=' f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:master '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:master | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| Running godep restore. | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + '[' -z 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 ']' | |
| ++ git-find-merge 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '020b1d5ff58419226ef6ae5fc556a05a42bb1e44^1..upstream-branch' --first-parent | |
| +++ git rev-list 020b1d5ff58419226ef6ae5fc556a05a42bb1e44..upstream-branch --ancestry-path | |
| +++ git rev-parse 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + local k_last_kube_merge=020b1d5ff58419226ef6ae5fc556a05a42bb1e44 | |
| + local dep_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 020b1d5ff58419226ef6ae5fc556a05a42bb1e44.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 020b1d5ff58419226ef6ae5fc556a05a42bb1e44. | |
| ++ look -b 020b1d5ff58419226ef6ae5fc556a05a42bb1e44 ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + echo 'Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library.' | |
| + rm -rf ./vendor/github.com/golang/glog | |
| Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library. | |
| + rm -rf ./vendor/k8s.io | |
| + rm -rf ./vendor/github.com/google/gofuzz | |
| + rm -rf ./vendor/github.com/go-openapi | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code f456898a08e4bbc5891694118f3819f324de12ff | |
| Remove redundant godep commits on-top of f456898a08e4bbc5891694118f3819f324de12ff. | |
| + echo 'Remove redundant godep commits on-top of f456898a08e4bbc5891694118f3819f324de12ff.' | |
| + git reset --soft -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + local repo=api | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'f456898 Merge pull request #68419 from xing-yang/apigroup' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=f456898a08e4bbc5891694118f3819f324de12ff | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-api-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-api-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-api-master.sh --dependencies apimachinery:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' f456898a08e4bbc5891694118f3819f324de12ff '!=' f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 07:23 UTC]: Successfully constructed master | |
| [24 Sep 18 07:23 UTC]: /publish_scripts/construct.sh api release-1.9 release-1.9 apimachinery:release-1.9 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/api kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=api | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/api | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Running garbage collection. | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/api release-1.9 release-1.9 apimachinery:release-1.9 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 9273ee02527c608cecc74969b3e489f5dba686da | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 22 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit 9273ee02527c608cecc74969b3e489f5dba686da. | |
| + echo 'Starting at existing release-1.9 commit 9273ee02527c608cecc74969b3e489f5dba686da.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| ++ git-find-merge 8d48604c2eca912159636be258a5e68bfc4c6643 upstream/release-1.9 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 8d48604c2eca912159636be258a5e68bfc4c6643..upstream/release-1.9 --ancestry-path | |
| +++ git rev-list '8d48604c2eca912159636be258a5e68bfc4c6643^1..upstream/release-1.9' --first-parent | |
| +++ git rev-parse 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local k_base_merge=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| + git branch -f filtered-branch-base 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/api.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/api 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/api. | |
| Running git filter-branch ... | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/api -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=1b1ac2cb0d5812b99f67372e8e25cda6976110eb | |
| ++ git log --first-parent --format=%H --reverse 1b1ac2cb0d5812b99f67372e8e25cda6976110eb..HEAD | |
| Checking out branch release-1.9. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=9273ee02527c608cecc74969b3e489f5dba686da | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=9273ee02527c608cecc74969b3e489f5dba686da | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 9273ee02527c608cecc74969b3e489f5dba686da '!=' 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=9273ee02527c608cecc74969b3e489f5dba686da | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + '[' -z 8d48604c2eca912159636be258a5e68bfc4c6643 ']' | |
| ++ git-find-merge 8d48604c2eca912159636be258a5e68bfc4c6643 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '8d48604c2eca912159636be258a5e68bfc4c6643^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 8d48604c2eca912159636be258a5e68bfc4c6643..upstream-branch --ancestry-path | |
| +++ git rev-parse 8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local k_last_kube_merge=8d48604c2eca912159636be258a5e68bfc4c6643 | |
| + local dep_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.9 | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 8d48604c2eca912159636be258a5e68bfc4c6643. | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 8d48604c2eca912159636be258a5e68bfc4c6643.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 8d48604c2eca912159636be258a5e68bfc4c6643 ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z 21efb2924c7cf1920f76af05b1fd6a325bf46dfc ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 21efb2924c7cf1920f76af05b1fd6a325bf46dfc | |
| + echo 'Checking out k8s.io/apimachinery to 21efb2924c7cf1920f76af05b1fd6a325bf46dfc' | |
| + git checkout -q 21efb2924c7cf1920f76af05b1fd6a325bf46dfc | |
| + popd | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 9273ee02527c608cecc74969b3e489f5dba686da | |
| + echo 'Remove redundant godep commits on-top of 9273ee02527c608cecc74969b3e489f5dba686da.' | |
| + git reset --soft -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| Remove redundant godep commits on-top of 9273ee02527c608cecc74969b3e489f5dba686da. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + local repo=api | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '9273ee0 Merge pull request #63626 from roycaihw/release-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=9273ee02527c608cecc74969b3e489f5dba686da | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-api-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-api-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-api-release-1.9.sh --dependencies apimachinery:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' 9273ee02527c608cecc74969b3e489f5dba686da '!=' 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 07:25 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 07:25 UTC]: /publish_scripts/construct.sh api release-1.10 release-1.10 apimachinery:release-1.10 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/api kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=api | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/api | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/api release-1.10 release-1.10 apimachinery:release-1.10 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 24 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit 12444147eb1150aa5c80d2aae532cbc5b7be73d0. | |
| + echo 'Starting at existing release-1.10 commit 12444147eb1150aa5c80d2aae532cbc5b7be73d0.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + '[' -z f34169348cf3c273ed6c140a422470c1a7e56259 ']' | |
| ++ git-find-merge f34169348cf3c273ed6c140a422470c1a7e56259 upstream/release-1.10 | |
| ++ tail -1 | |
| +++ git rev-list 'f34169348cf3c273ed6c140a422470c1a7e56259^1..upstream/release-1.10' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f34169348cf3c273ed6c140a422470c1a7e56259..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + local k_base_merge=f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + '[' -z f34169348cf3c273ed6c140a422470c1a7e56259 ']' | |
| + git branch -f filtered-branch-base f34169348cf3c273ed6c140a422470c1a7e56259 | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/api. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/api.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/api 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/api -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=867bfdbe83033db23f368bb664f80fd5b1817220 | |
| ++ git log --first-parent --format=%H --reverse 867bfdbe83033db23f368bb664f80fd5b1817220..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| Fixing up godeps after a complete sync | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 12444147eb1150aa5c80d2aae532cbc5b7be73d0 '!=' 12444147eb1150aa5c80d2aae532cbc5b7be73d0 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + '[' -z f34169348cf3c273ed6c140a422470c1a7e56259 ']' | |
| ++ git-find-merge f34169348cf3c273ed6c140a422470c1a7e56259 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f34169348cf3c273ed6c140a422470c1a7e56259^1..upstream-branch' --first-parent | |
| +++ git rev-list f34169348cf3c273ed6c140a422470c1a7e56259..upstream-branch --ancestry-path | |
| +++ git rev-parse f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + local k_last_kube_merge=f34169348cf3c273ed6c140a422470c1a7e56259 | |
| + local dep_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f34169348cf3c273ed6c140a422470c1a7e56259.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f34169348cf3c273ed6c140a422470c1a7e56259. | |
| ++ look -b f34169348cf3c273ed6c140a422470c1a7e56259 ../kube-commits-apimachinery-release-1.10 | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-1.10 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| Godeps.json hasn't changed! | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| Remove redundant godep commits on-top of 12444147eb1150aa5c80d2aae532cbc5b7be73d0. | |
| + echo 'Remove redundant godep commits on-top of 12444147eb1150aa5c80d2aae532cbc5b7be73d0.' | |
| + git reset --soft -q 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + local repo=api | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '1244414 Merge pull request #65637 from gnufied/automated-cherry-pick-of-#65598-upstream-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-api-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-api-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-api-release-1.10.sh --dependencies apimachinery:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' 12444147eb1150aa5c80d2aae532cbc5b7be73d0 '!=' 12444147eb1150aa5c80d2aae532cbc5b7be73d0 ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 07:26 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 07:26 UTC]: /publish_scripts/construct.sh api release-1.11 release-1.11 apimachinery:release-1.11 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/api kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=api | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/api | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Fetching from origin. | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/api release-1.11 release-1.11 apimachinery:release-1.11 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 26 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit 4e7be11eab3ffcfc1876898b8272df53785a9504. | |
| + echo 'Starting at existing release-1.11 commit 4e7be11eab3ffcfc1876898b8272df53785a9504.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/api. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/api.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/api 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Running git filter-branch ... | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/api -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=3ea555a549ef71bafe37afb6ad7191868589ceca | |
| ++ git log --first-parent --format=%H --reverse 3ea555a549ef71bafe37afb6ad7191868589ceca..HEAD | |
| Checking out branch release-1.11. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 4e7be11eab3ffcfc1876898b8272df53785a9504 '!=' 4e7be11eab3ffcfc1876898b8272df53785a9504 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f | |
| + echo 'Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f' | |
| + git checkout -q def12e63c512da17043b4f0293f52d1006603d9f | |
| + popd | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Godeps.json hasn't changed! | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| Remove redundant godep commits on-top of 4e7be11eab3ffcfc1876898b8272df53785a9504. | |
| + echo 'Remove redundant godep commits on-top of 4e7be11eab3ffcfc1876898b8272df53785a9504.' | |
| + git reset --soft -q 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + local repo=api | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '4e7be11 Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-api-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-api-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-api-release-1.11.sh --dependencies apimachinery:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' 4e7be11eab3ffcfc1876898b8272df53785a9504 '!=' 4e7be11eab3ffcfc1876898b8272df53785a9504 ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 07:27 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 07:27 UTC]: /publish_scripts/construct.sh api release-1.12 release-1.12 apimachinery:release-1.12 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/api kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=api | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/api | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/api release-1.12 release-1.12 apimachinery:release-1.12 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 507f29373a170184d325ea007e032b686bb189ac | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 27 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 507f29373a170184d325ea007e032b686bb189ac. | |
| + echo 'Starting at existing release-1.12 commit 507f29373a170184d325ea007e032b686bb189ac.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=a17f7acd6902f306308684489c05e9cc0c187863 | |
| + '[' -z a17f7acd6902f306308684489c05e9cc0c187863 ']' | |
| ++ git-find-merge a17f7acd6902f306308684489c05e9cc0c187863 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'a17f7acd6902f306308684489c05e9cc0c187863^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a17f7acd6902f306308684489c05e9cc0c187863..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse a17f7acd6902f306308684489c05e9cc0c187863 | |
| + local k_base_merge=a17f7acd6902f306308684489c05e9cc0c187863 | |
| + '[' -z a17f7acd6902f306308684489c05e9cc0c187863 ']' | |
| + git branch -f filtered-branch-base a17f7acd6902f306308684489c05e9cc0c187863 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/api. | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/api.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/api 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/api | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| Running git filter-branch ... | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/api -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=7914848d832b209a5f9124adb49438d9797a7a47 | |
| ++ git log --first-parent --format=%H --reverse 7914848d832b209a5f9124adb49438d9797a7a47..HEAD | |
| Checking out branch release-1.12. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=507f29373a170184d325ea007e032b686bb189ac | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=507f29373a170184d325ea007e032b686bb189ac | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| Fixing up godeps after a complete sync | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 507f29373a170184d325ea007e032b686bb189ac '!=' 507f29373a170184d325ea007e032b686bb189ac ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.12 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=507f29373a170184d325ea007e032b686bb189ac | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=a17f7acd6902f306308684489c05e9cc0c187863 | |
| + '[' -z a17f7acd6902f306308684489c05e9cc0c187863 ']' | |
| ++ git-find-merge a17f7acd6902f306308684489c05e9cc0c187863 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'a17f7acd6902f306308684489c05e9cc0c187863^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a17f7acd6902f306308684489c05e9cc0c187863..upstream-branch --ancestry-path | |
| +++ git rev-parse a17f7acd6902f306308684489c05e9cc0c187863 | |
| + local k_last_kube_merge=a17f7acd6902f306308684489c05e9cc0c187863 | |
| + local dep_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a17f7acd6902f306308684489c05e9cc0c187863. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a17f7acd6902f306308684489c05e9cc0c187863.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a17f7acd6902f306308684489c05e9cc0c187863 ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 507f29373a170184d325ea007e032b686bb189ac | |
| + echo 'Remove redundant godep commits on-top of 507f29373a170184d325ea007e032b686bb189ac.' | |
| + git reset --soft -q 507f29373a170184d325ea007e032b686bb189ac | |
| Remove redundant godep commits on-top of 507f29373a170184d325ea007e032b686bb189ac. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/api | |
| + local repo=api | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.12 | |
| + '[' -n 'b9bd491 Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-api-release-1.12' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=507f29373a170184d325ea007e032b686bb189ac | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-api-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-api-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-api-release-1.12.sh --dependencies apimachinery:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery. | |
| Bumping k8s.io/apimachinery in Godeps.json from "f5b6853bd76029f599270fd9584f69a8469f0d8c" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging f14efbe56879fd9b83959f8ede688c9e91f3277d as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 507f29373a170184d325ea007e032b686bb189ac '!=' 507f29373a170184d325ea007e032b686bb189ac ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was f14efbe... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 07:29 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 07:29 UTC]: Successfully ensured /go-workspace/src/k8s.io/client-go exists | |
| [24 Sep 18 07:29 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 07:29 UTC]: /publish_scripts/construct.sh client-go master master apimachinery:master,api:master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/client-go kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=client-go | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/client-go | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/client-go master master apimachinery:master,api:master '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 26 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f. | |
| + echo 'Starting at existing master commit ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=817d420d6807d0b3bd0a4baa20d709ab755ad602 | |
| + '[' -z 817d420d6807d0b3bd0a4baa20d709ab755ad602 ']' | |
| ++ git-find-merge 817d420d6807d0b3bd0a4baa20d709ab755ad602 upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '817d420d6807d0b3bd0a4baa20d709ab755ad602^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 817d420d6807d0b3bd0a4baa20d709ab755ad602..upstream/master --ancestry-path | |
| +++ git rev-parse 817d420d6807d0b3bd0a4baa20d709ab755ad602 | |
| + local k_base_merge=817d420d6807d0b3bd0a4baa20d709ab755ad602 | |
| + '[' -z 817d420d6807d0b3bd0a4baa20d709ab755ad602 ']' | |
| + git branch -f filtered-branch-base 817d420d6807d0b3bd0a4baa20d709ab755ad602 | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/client-go. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/client-go.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/client-go 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| Running git filter-branch ... | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/client-go -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=a9478c80fec7a235fbc615868b2d20322d83b9b2 | |
| ++ git log --first-parent --format=%H --reverse a9478c80fec7a235fbc615868b2d20322d83b9b2..HEAD | |
| + f_mainline_commits=ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' ffa55d32c8143cc5bc3849fda4541b650ff26b23 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| ++ kube-commit Kubernetes-commit ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%B -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + k_mainline_commit=331ae66491a775c24887413f44549d83b797b61e | |
| ++ git-find-merge 331ae66491a775c24887413f44549d83b797b61e upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '331ae66491a775c24887413f44549d83b797b61e^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 331ae66491a775c24887413f44549d83b797b61e..upstream-branch --ancestry-path | |
| +++ git rev-parse 331ae66491a775c24887413f44549d83b797b61e | |
| + k_new_pending_merge_commit=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + '[' 259a59d93618f0266151a50018f3b3f3cbcfc0e4 = 331ae66491a775c24887413f44549d83b797b61e ']' | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + '[' ffa55d32c8143cc5bc3849fda4541b650ff26b23 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + '[' master '!=' master ']' | |
| + '[' master '!=' master ']' | |
| + is-merge ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=short -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + return 1 | |
| + local pick_args= | |
| + is-merge ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=short -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + return 1 | |
| ++ commit-subject ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%s -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| Cherry-picking k8s.io/kubernetes single-commit 331ae66491a775c24887413f44549d83b797b61e: Move INSTALL.md from k8s.io/client-go to staging. | |
| + echo 'Cherry-picking k8s.io/kubernetes single-commit 331ae66491a775c24887413f44549d83b797b61e: Move INSTALL.md from k8s.io/client-go to staging.' | |
| + local squash_commits=1 | |
| + godep-changes ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + '[' -n '' ']' | |
| + git diff --exit-code --quiet 'ffa55d32c8143cc5bc3849fda4541b650ff26b23^' ffa55d32c8143cc5bc3849fda4541b650ff26b23 -- Godeps/Godeps.json | |
| ++ commit-date ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%aD -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 20:55:22 +0530' | |
| + git cherry-pick --keep-redundant-commits ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + squash 1 | |
| ++ git rev-parse HEAD | |
| + local head=c8e76297e14d9bd6b03caf5f280ece32e6be7cee | |
| + git reset -q --soft HEAD~1 | |
| ++ committer-date c8e76297e14d9bd6b03caf5f280ece32e6be7cee | |
| ++ git show --format=%cD -q c8e76297e14d9bd6b03caf5f280ece32e6be7cee | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 20:55:22 +0530' | |
| + git commit --allow-empty -q -C c8e76297e14d9bd6b03caf5f280ece32e6be7cee | |
| + '[' -z 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ']' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ']' | |
| + '[' FLUSH_PENDING_MERGE_COMMIT '!=' 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ']' | |
| + local dst_parent2=HEAD | |
| + '[' master '!=' master ']' | |
| ++ commit-subject 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| ++ git show --format=%s -q 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| Cherry-picking source dropped-merge 259a59d93618f0266151a50018f3b3f3cbcfc0e4: Merge pull request #68790 from nikhita/client-go-install.md. | |
| + echo 'Cherry-picking source dropped-merge 259a59d93618f0266151a50018f3b3f3cbcfc0e4: Merge pull request #68790 from nikhita/client-go-install.md.' | |
| ++ commit-date 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| ++ git show --format=%aD -q 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + local 'date=Wed, 19 Sep 2018 06:22:14 -0700' | |
| +++ commit-message 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| +++ git show --format=%B -q 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| +++ echo | |
| +++ echo 'Kubernetes-commit: 259a59d93618f0266151a50018f3b3f3cbcfc0e4' | |
| ++ GIT_COMMITTER_DATE='Wed, 19 Sep 2018 06:22:14 -0700' | |
| ++ GIT_AUTHOR_DATE='Wed, 19 Sep 2018 06:22:14 -0700' | |
| ++ git commit-tree -p ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f -p HEAD -m 'Merge pull request #68790 from nikhita/client-go-install.md | |
| Move INSTALL.md from k8s.io/client-go to staging | |
| Kubernetes-commit: 259a59d93618f0266151a50018f3b3f3cbcfc0e4' 'HEAD^{tree}' | |
| + local dst_new_merge=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + git reset -q --hard 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + fix-godeps apimachinery:master,api:master '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + '[' -z 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ']' | |
| ++ git-find-merge 259a59d93618f0266151a50018f3b3f3cbcfc0e4 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '259a59d93618f0266151a50018f3b3f3cbcfc0e4^1..upstream-branch' --first-parent | |
| +++ git rev-list 259a59d93618f0266151a50018f3b3f3cbcfc0e4..upstream-branch --ancestry-path | |
| +++ git rev-parse 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + local k_last_kube_merge=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4. | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4. | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ../kube-commits-api-master | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff | |
| + echo 'Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff' | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + update-deps-in-godep-json apimachinery:master,api:master k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:master,api:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -n 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + '[' 99c5fa21f87204c2875a7f7ba977895d79b35c44 '!=' 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' -n f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + '[' f456898a08e4bbc5891694118f3819f324de12ff '!=' f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| Remove redundant godep commits on-top of 93821fae8052eae2e5ab4cac6ee2214e990e9401. | |
| + echo 'Remove redundant godep commits on-top of 93821fae8052eae2e5ab4cac6ee2214e990e9401.' | |
| + git reset --soft -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 93821fae8052eae2e5ab4cac6ee2214e990e9401 '!=' ca74aedde1ee2ea0ae6a39c3fb58409c1f04840f ']' | |
| + fix-godeps apimachinery:master,api:master '' k8s.io true true true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:master,api:master | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + '[' -z 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ']' | |
| ++ git-find-merge 259a59d93618f0266151a50018f3b3f3cbcfc0e4 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '259a59d93618f0266151a50018f3b3f3cbcfc0e4^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 259a59d93618f0266151a50018f3b3f3cbcfc0e4..upstream-branch --ancestry-path | |
| +++ git rev-parse 259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4. | |
| + local k_last_kube_merge=259a59d93618f0266151a50018f3b3f3cbcfc0e4 | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ../kube-commits-apimachinery-master | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 259a59d93618f0266151a50018f3b3f3cbcfc0e4. | |
| ++ look -b 259a59d93618f0266151a50018f3b3f3cbcfc0e4 ../kube-commits-api-master | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff | |
| + echo 'Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff' | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + echo 'Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library.' | |
| + rm -rf ./vendor/github.com/golang/glog | |
| Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library. | |
| + rm -rf ./vendor/k8s.io | |
| + rm -rf ./vendor/github.com/google/gofuzz | |
| + rm -rf ./vendor/github.com/go-openapi | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| Remove redundant godep commits on-top of 93821fae8052eae2e5ab4cac6ee2214e990e9401. | |
| + echo 'Remove redundant godep commits on-top of 93821fae8052eae2e5ab4cac6ee2214e990e9401.' | |
| + git reset --soft -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + local repo=client-go | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-master | |
| + '[' -n '93821fa Merge pull request #68790 from nikhita/client-go-install.md' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-master' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-client-go-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-client-go-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-client-go-master.sh --dependencies apimachinery:master,api:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' 93821fae8052eae2e5ab4cac6ee2214e990e9401 '!=' 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| [24 Sep 18 07:32 UTC]: Successfully constructed master | |
| [24 Sep 18 07:32 UTC]: /publish_scripts/construct.sh client-go release-1.9 release-6.0 apimachinery:release-1.9,api:release-1.9 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/client-go kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=client-go | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-6.0 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/client-go | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + git branch -D release-6.0 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-6.0 | |
| Switching to origin/release-6.0. | |
| + echo 'Switching to origin/release-6.0.' | |
| + git branch -f release-6.0 origin/release-6.0 | |
| + git checkout -q release-6.0 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/client-go release-1.9 release-6.0 apimachinery:release-1.9,api:release-1.9 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-6.0 | |
| + local deps=apimachinery:release-1.9,api:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 21 = 0 ']' | |
| ++ git rev-parse HEAD | |
| + echo 'Starting at existing release-6.0 commit 115d23201cc1aa2260c19f8f6bb79d400d123dbd.' | |
| + git branch -D filtered-branch | |
| Starting at existing release-6.0 commit 115d23201cc1aa2260c19f8f6bb79d400d123dbd. | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-6.0 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ git log --format=%B release-6.0 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ true | |
| + local k_base_commit=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| ++ git-find-merge da2670acf516d03b4e8b9889f403602669704507 upstream/release-1.9 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'da2670acf516d03b4e8b9889f403602669704507^1..upstream/release-1.9' --first-parent | |
| +++ git rev-list da2670acf516d03b4e8b9889f403602669704507..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse da2670acf516d03b4e8b9889f403602669704507 | |
| + local k_base_merge=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| + git branch -f filtered-branch-base da2670acf516d03b4e8b9889f403602669704507 | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/client-go.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/client-go 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/client-go. | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| Running git filter-branch ... | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/client-go -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=42dc3e4c6defd6f4a88c1be7ceb222188312d1f6 | |
| ++ git log --first-parent --format=%H --reverse 42dc3e4c6defd6f4a88c1be7ceb222188312d1f6..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-6.0.' | |
| + git checkout -q release-6.0 | |
| Checking out branch release-6.0. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 115d23201cc1aa2260c19f8f6bb79d400d123dbd '!=' 115d23201cc1aa2260c19f8f6bb79d400d123dbd ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ git log --format=%B HEAD | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| ++ git-find-merge da2670acf516d03b4e8b9889f403602669704507 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'da2670acf516d03b4e8b9889f403602669704507^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list da2670acf516d03b4e8b9889f403602669704507..upstream-branch --ancestry-path | |
| +++ git rev-parse da2670acf516d03b4e8b9889f403602669704507 | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507. | |
| + local k_last_kube_merge=da2670acf516d03b4e8b9889f403602669704507 | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b da2670acf516d03b4e8b9889f403602669704507 ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507.' | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b da2670acf516d03b4e8b9889f403602669704507 ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-6.0 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-6.0 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + echo 'Remove redundant godep commits on-top of 115d23201cc1aa2260c19f8f6bb79d400d123dbd.' | |
| + git reset --soft -q 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| Remove redundant godep commits on-top of 115d23201cc1aa2260c19f8f6bb79d400d123dbd. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + local repo=client-go | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '115d232 Merge pull request #67162 from dekkagaijin/automated-cherry-pick-of-#65799-upstream-release-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-6.0' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-6.0 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-6.0 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-client-go-release-6.0.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-client-go-release-6.0.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-client-go-release-6.0.sh --dependencies apimachinery:release-1.9,api:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-6.0 | |
| + '[' 115d23201cc1aa2260c19f8f6bb79d400d123dbd '!=' 115d23201cc1aa2260c19f8f6bb79d400d123dbd ']' | |
| + git checkout release-6.0 | |
| Already on 'release-6.0' | |
| Your branch is up-to-date with 'origin/release-6.0'. | |
| [24 Sep 18 07:34 UTC]: Successfully constructed release-6.0 | |
| [24 Sep 18 07:34 UTC]: /publish_scripts/construct.sh client-go release-1.10 release-7.0 apimachinery:release-1.10,api:release-1.10 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/client-go kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=client-go | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-7.0 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/client-go | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + git branch -D release-7.0 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-7.0 | |
| Switching to origin/release-7.0. | |
| + echo 'Switching to origin/release-7.0.' | |
| + git branch -f release-7.0 origin/release-7.0 | |
| + git checkout -q release-7.0 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/client-go release-1.10 release-7.0 apimachinery:release-1.10,api:release-1.10 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-7.0 | |
| + local deps=apimachinery:release-1.10,api:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| ++ wc -l | |
| ++ ls -1 | |
| + '[' 23 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-7.0 commit 745ca830039794f7b927b8a2c2a58dcc1e8a0a72. | |
| + echo 'Starting at existing release-7.0 commit 745ca830039794f7b927b8a2c2a58dcc1e8a0a72.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-7.0 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-7.0 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + '[' -z b16193f435cefa70de14823738a2c5af3d99b7ca ']' | |
| ++ git-find-merge b16193f435cefa70de14823738a2c5af3d99b7ca upstream/release-1.10 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'b16193f435cefa70de14823738a2c5af3d99b7ca^1..upstream/release-1.10' --first-parent | |
| +++ git rev-list b16193f435cefa70de14823738a2c5af3d99b7ca..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + local k_base_merge=b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + '[' -z b16193f435cefa70de14823738a2c5af3d99b7ca ']' | |
| + git branch -f filtered-branch-base b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/client-go.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/client-go 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/client-go. | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| Running git filter-branch ... | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/client-go -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=01c4e03b3aefaec8bd8e6dc7c446680e02b4d4e3 | |
| ++ git log --first-parent --format=%H --reverse 01c4e03b3aefaec8bd8e6dc7c446680e02b4d4e3..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-7.0.' | |
| + git checkout -q release-7.0 | |
| Checking out branch release-7.0. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 '!=' 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| Running godep restore. | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + '[' -z b16193f435cefa70de14823738a2c5af3d99b7ca ']' | |
| ++ git-find-merge b16193f435cefa70de14823738a2c5af3d99b7ca upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'b16193f435cefa70de14823738a2c5af3d99b7ca^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list b16193f435cefa70de14823738a2c5af3d99b7ca..upstream-branch --ancestry-path | |
| +++ git rev-parse b16193f435cefa70de14823738a2c5af3d99b7ca | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit b16193f435cefa70de14823738a2c5af3d99b7ca. | |
| + local k_last_kube_merge=b16193f435cefa70de14823738a2c5af3d99b7ca | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit b16193f435cefa70de14823738a2c5af3d99b7ca.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b b16193f435cefa70de14823738a2c5af3d99b7ca ../kube-commits-apimachinery-release-1.10 | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit b16193f435cefa70de14823738a2c5af3d99b7ca.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit b16193f435cefa70de14823738a2c5af3d99b7ca. | |
| ++ look -b b16193f435cefa70de14823738a2c5af3d99b7ca ../kube-commits-api-release-1.10 | |
| + '[' -z 0f11257a8a25954878633ebdc9841c67d8f83bdb ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 0f11257a8a25954878633ebdc9841c67d8f83bdb' | |
| + git checkout -q 0f11257a8a25954878633ebdc9841c67d8f83bdb | |
| Checking out k8s.io/api to 0f11257a8a25954878633ebdc9841c67d8f83bdb | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-7.0 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| Godeps.json hasn't changed! | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-7.0 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| Remove redundant godep commits on-top of 745ca830039794f7b927b8a2c2a58dcc1e8a0a72. | |
| + echo 'Remove redundant godep commits on-top of 745ca830039794f7b927b8a2c2a58dcc1e8a0a72.' | |
| + git reset --soft -q 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + local repo=client-go | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '745ca83 Merge pull request #67393 from nikhita/automated-cherry-pick-of-#66249-upstream-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-7.0' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-7.0 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-7.0 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-client-go-release-7.0.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-client-go-release-7.0.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-client-go-release-7.0.sh --dependencies apimachinery:release-1.10,api:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-7.0 | |
| + '[' 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 '!=' 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 ']' | |
| + git checkout release-7.0 | |
| Already on 'release-7.0' | |
| Your branch is up-to-date with 'origin/release-7.0'. | |
| [24 Sep 18 07:37 UTC]: Successfully constructed release-7.0 | |
| [24 Sep 18 07:37 UTC]: /publish_scripts/construct.sh client-go release-1.11 release-8.0 apimachinery:release-1.11,api:release-1.11 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/client-go kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=client-go | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-8.0 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/client-go | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + git branch -D release-8.0 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-8.0 | |
| Switching to origin/release-8.0. | |
| + echo 'Switching to origin/release-8.0.' | |
| + git branch -f release-8.0 origin/release-8.0 | |
| + git checkout -q release-8.0 | |
| + echo 'Fetching upstream changes.' | |
| Fetching upstream changes. | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/client-go release-1.11 release-8.0 apimachinery:release-1.11,api:release-1.11 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-8.0 | |
| + local deps=apimachinery:release-1.11,api:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 26 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-8.0 commit f2f85107cac6fe04c30435ca0ac0c3318fd1b94c. | |
| + echo 'Starting at existing release-8.0 commit f2f85107cac6fe04c30435ca0ac0c3318fd1b94c.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-8.0 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-8.0 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + '[' -z f53fc73da201d21cb12f6093a68f01b5ef594e5c ']' | |
| ++ git-find-merge f53fc73da201d21cb12f6093a68f01b5ef594e5c upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f53fc73da201d21cb12f6093a68f01b5ef594e5c^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f53fc73da201d21cb12f6093a68f01b5ef594e5c..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + local k_base_merge=f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + '[' -z f53fc73da201d21cb12f6093a68f01b5ef594e5c ']' | |
| + git branch -f filtered-branch-base f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/client-go. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/client-go.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/client-go 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| Running git filter-branch ... | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/client-go -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=ad58bdd8572d5a33a87405669eeb2ae19af38d17 | |
| ++ git log --first-parent --format=%H --reverse ad58bdd8572d5a33a87405669eeb2ae19af38d17..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-8.0.' | |
| + git checkout -q release-8.0 | |
| Checking out branch release-8.0. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' f2f85107cac6fe04c30435ca0ac0c3318fd1b94c '!=' f2f85107cac6fe04c30435ca0ac0c3318fd1b94c ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + '[' -z f53fc73da201d21cb12f6093a68f01b5ef594e5c ']' | |
| ++ git-find-merge f53fc73da201d21cb12f6093a68f01b5ef594e5c upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f53fc73da201d21cb12f6093a68f01b5ef594e5c^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f53fc73da201d21cb12f6093a68f01b5ef594e5c..upstream-branch --ancestry-path | |
| +++ git rev-parse f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + local k_last_kube_merge=f53fc73da201d21cb12f6093a68f01b5ef594e5c | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f53fc73da201d21cb12f6093a68f01b5ef594e5c.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f53fc73da201d21cb12f6093a68f01b5ef594e5c. | |
| ++ look -b f53fc73da201d21cb12f6093a68f01b5ef594e5c ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z 488889b0007f63ffee90b66a34a2deca9ec58774 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 488889b0007f63ffee90b66a34a2deca9ec58774 | |
| + echo 'Checking out k8s.io/apimachinery to 488889b0007f63ffee90b66a34a2deca9ec58774' | |
| + git checkout -q 488889b0007f63ffee90b66a34a2deca9ec58774 | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f53fc73da201d21cb12f6093a68f01b5ef594e5c.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f53fc73da201d21cb12f6093a68f01b5ef594e5c. | |
| ++ look -b f53fc73da201d21cb12f6093a68f01b5ef594e5c ../kube-commits-api-release-1.11 | |
| + '[' -z 2d6f90ab1293a1fb871cf149423ebb72aa7423aa ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 2d6f90ab1293a1fb871cf149423ebb72aa7423aa | |
| + echo 'Checking out k8s.io/api to 2d6f90ab1293a1fb871cf149423ebb72aa7423aa' | |
| + git checkout -q 2d6f90ab1293a1fb871cf149423ebb72aa7423aa | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-8.0 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-8.0 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| Remove redundant godep commits on-top of f2f85107cac6fe04c30435ca0ac0c3318fd1b94c. | |
| + echo 'Remove redundant godep commits on-top of f2f85107cac6fe04c30435ca0ac0c3318fd1b94c.' | |
| + git reset --soft -q f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + local repo=client-go | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'f2f8510 Merge pull request #67164 from dekkagaijin/automated-cherry-pick-of-#65799-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-8.0' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-8.0 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-8.0 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-client-go-release-8.0.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-client-go-release-8.0.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-client-go-release-8.0.sh --dependencies apimachinery:release-1.11,api:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-8.0 | |
| + '[' f2f85107cac6fe04c30435ca0ac0c3318fd1b94c '!=' f2f85107cac6fe04c30435ca0ac0c3318fd1b94c ']' | |
| + git checkout release-8.0 | |
| Already on 'release-8.0' | |
| Your branch is up-to-date with 'origin/release-8.0'. | |
| [24 Sep 18 07:39 UTC]: Successfully constructed release-8.0 | |
| [24 Sep 18 07:39 UTC]: /publish_scripts/construct.sh client-go release-1.12 release-9.0 apimachinery:release-1.12,api:release-1.12 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/client-go kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=client-go | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-9.0 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/client-go | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + git branch -D release-9.0 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-9.0 | |
| Switching to origin/release-9.0. | |
| + echo 'Switching to origin/release-9.0.' | |
| + git branch -f release-9.0 origin/release-9.0 | |
| + git checkout -q release-9.0 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/client-go release-1.12 release-9.0 apimachinery:release-1.12,api:release-1.12 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-9.0 | |
| + local deps=apimachinery:release-1.12,api:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 2126806484aba61659eae14c82315d373c4b5312 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 25 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-9.0 commit 2126806484aba61659eae14c82315d373c4b5312. | |
| + echo 'Starting at existing release-9.0 commit 2126806484aba61659eae14c82315d373c4b5312.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-9.0 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-9.0 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=c185d97b8d9f2b687ecac6fc88350476155da716 | |
| + '[' -z c185d97b8d9f2b687ecac6fc88350476155da716 ']' | |
| ++ git-find-merge c185d97b8d9f2b687ecac6fc88350476155da716 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'c185d97b8d9f2b687ecac6fc88350476155da716^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list c185d97b8d9f2b687ecac6fc88350476155da716..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse c185d97b8d9f2b687ecac6fc88350476155da716 | |
| + local k_base_merge=c185d97b8d9f2b687ecac6fc88350476155da716 | |
| + '[' -z c185d97b8d9f2b687ecac6fc88350476155da716 ']' | |
| + git branch -f filtered-branch-base c185d97b8d9f2b687ecac6fc88350476155da716 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/client-go. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/client-go.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/client-go 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/client-go | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/client-go -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=a9478c80fec7a235fbc615868b2d20322d83b9b2 | |
| ++ git log --first-parent --format=%H --reverse a9478c80fec7a235fbc615868b2d20322d83b9b2..HEAD | |
| + f_mainline_commits=ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + echo 'Checking out branch release-9.0.' | |
| + git checkout -q release-9.0 | |
| Checking out branch release-9.0. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=2126806484aba61659eae14c82315d373c4b5312 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=2126806484aba61659eae14c82315d373c4b5312 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' ffa55d32c8143cc5bc3849fda4541b650ff26b23 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| ++ kube-commit Kubernetes-commit ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%B -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + k_mainline_commit=331ae66491a775c24887413f44549d83b797b61e | |
| ++ git-find-merge 331ae66491a775c24887413f44549d83b797b61e upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '331ae66491a775c24887413f44549d83b797b61e^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 331ae66491a775c24887413f44549d83b797b61e..upstream-branch --ancestry-path | |
| +++ git rev-parse 331ae66491a775c24887413f44549d83b797b61e | |
| + k_new_pending_merge_commit=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + '[' 4e599c848401470c3c10eb52252c5e3bb5463d3b = 331ae66491a775c24887413f44549d83b797b61e ']' | |
| + '[' release-9.0 '!=' master ']' | |
| + is-merge-with-master 331ae66491a775c24887413f44549d83b797b61e | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 331ae66491a775c24887413f44549d83b797b61e | |
| ++ git show --format=short -q 331ae66491a775c24887413f44549d83b797b61e | |
| + return 1 | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + '[' ffa55d32c8143cc5bc3849fda4541b650ff26b23 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + '[' release-9.0 '!=' master ']' | |
| + is-merge-with-master 331ae66491a775c24887413f44549d83b797b61e | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 331ae66491a775c24887413f44549d83b797b61e | |
| ++ git show --format=short -q 331ae66491a775c24887413f44549d83b797b61e | |
| + return 1 | |
| + '[' release-9.0 '!=' master ']' | |
| + '[' -n 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| + is-merge-with-master 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| ++ git show --format=short -q 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + return 1 | |
| + is-merge ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=short -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + return 1 | |
| + local pick_args= | |
| + is-merge ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=short -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + return 1 | |
| ++ commit-subject ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%s -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + echo 'Cherry-picking k8s.io/kubernetes single-commit 331ae66491a775c24887413f44549d83b797b61e: Move INSTALL.md from k8s.io/client-go to staging.' | |
| + local squash_commits=1 | |
| + godep-changes ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + '[' -n '' ']' | |
| + git diff --exit-code --quiet 'ffa55d32c8143cc5bc3849fda4541b650ff26b23^' ffa55d32c8143cc5bc3849fda4541b650ff26b23 -- Godeps/Godeps.json | |
| Cherry-picking k8s.io/kubernetes single-commit 331ae66491a775c24887413f44549d83b797b61e: Move INSTALL.md from k8s.io/client-go to staging. | |
| ++ commit-date ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| ++ git show --format=%aD -q ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 20:55:22 +0530' | |
| + git cherry-pick --keep-redundant-commits ffa55d32c8143cc5bc3849fda4541b650ff26b23 | |
| + squash 1 | |
| ++ git rev-parse HEAD | |
| + local head=782e8407789ec1b8245c25071f305de064a1597b | |
| + git reset -q --soft HEAD~1 | |
| ++ committer-date 782e8407789ec1b8245c25071f305de064a1597b | |
| ++ git show --format=%cD -q 782e8407789ec1b8245c25071f305de064a1597b | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 20:55:22 +0530' | |
| + git commit --allow-empty -q -C 782e8407789ec1b8245c25071f305de064a1597b | |
| + '[' -z 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| + '[' FLUSH_PENDING_MERGE_COMMIT '!=' 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| + local dst_parent2=HEAD | |
| + '[' release-9.0 '!=' master ']' | |
| + is-merge-with-master 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| ++ git show --format=short -q 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + return 1 | |
| ++ commit-subject 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| ++ git show --format=%s -q 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + echo 'Cherry-picking source dropped-merge 4e599c848401470c3c10eb52252c5e3bb5463d3b: Merge remote-tracking branch '\''origin/master'\'' into release-1.12.' | |
| Cherry-picking source dropped-merge 4e599c848401470c3c10eb52252c5e3bb5463d3b: Merge remote-tracking branch 'origin/master' into release-1.12. | |
| ++ commit-date 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| ++ git show --format=%aD -q 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + local 'date=Wed, 19 Sep 2018 15:55:54 -0700' | |
| +++ commit-message 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| +++ git show --format=%B -q 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| +++ echo | |
| +++ echo 'Kubernetes-commit: 4e599c848401470c3c10eb52252c5e3bb5463d3b' | |
| ++ GIT_COMMITTER_DATE='Wed, 19 Sep 2018 15:55:54 -0700' | |
| ++ GIT_AUTHOR_DATE='Wed, 19 Sep 2018 15:55:54 -0700' | |
| ++ git commit-tree -p 2126806484aba61659eae14c82315d373c4b5312 -p HEAD -m 'Merge remote-tracking branch '\''origin/master'\'' into release-1.12 | |
| Kubernetes-commit: 4e599c848401470c3c10eb52252c5e3bb5463d3b' 'HEAD^{tree}' | |
| + local dst_new_merge=3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + git reset -q --hard 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12 '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + '[' -z 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| ++ git-find-merge 4e599c848401470c3c10eb52252c5e3bb5463d3b upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '4e599c848401470c3c10eb52252c5e3bb5463d3b^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 4e599c848401470c3c10eb52252c5e3bb5463d3b..upstream-branch --ancestry-path | |
| +++ git rev-parse 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + local k_last_kube_merge=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 4e599c848401470c3c10eb52252c5e3bb5463d3b ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b. | |
| ++ look -b 4e599c848401470c3c10eb52252c5e3bb5463d3b ../kube-commits-api-release-1.12 | |
| + '[' -z b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc' | |
| + git checkout -q b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| Checking out k8s.io/api to b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + update-deps-in-godep-json apimachinery:release-1.12,api:release-1.12 k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:release-1.12,api:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + '[' -n 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + '[' 6dd46049f39503a1fc8d65de4bd566829e95faff '!=' 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + '[' -z b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + '[' -n b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc ']' | |
| + '[' b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc '!=' b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc ']' | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-9.0 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| Remove redundant godep commits on-top of 3e32c8333043fc2c058455f4d32986a89d31b05b. | |
| + echo 'Remove redundant godep commits on-top of 3e32c8333043fc2c058455f4d32986a89d31b05b.' | |
| + git reset --soft -q 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 3e32c8333043fc2c058455f4d32986a89d31b05b '!=' 2126806484aba61659eae14c82315d373c4b5312 ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12 '' k8s.io true true true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + '[' -z 4e599c848401470c3c10eb52252c5e3bb5463d3b ']' | |
| ++ git-find-merge 4e599c848401470c3c10eb52252c5e3bb5463d3b upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '4e599c848401470c3c10eb52252c5e3bb5463d3b^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 4e599c848401470c3c10eb52252c5e3bb5463d3b..upstream-branch --ancestry-path | |
| +++ git rev-parse 4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + local k_last_kube_merge=4e599c848401470c3c10eb52252c5e3bb5463d3b | |
| + local dep_count=2 | |
| + (( i=0 )) | |
| + (( i<2 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b. | |
| ++ look -b 4e599c848401470c3c10eb52252c5e3bb5463d3b ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4e599c848401470c3c10eb52252c5e3bb5463d3b. | |
| ++ look -b 4e599c848401470c3c10eb52252c5e3bb5463d3b ../kube-commits-api-release-1.12 | |
| + '[' -z b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + echo 'Checking out k8s.io/api to b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc' | |
| + git checkout -q b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc | |
| + popd | |
| + (( i++ )) | |
| + (( i<2 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-9.0 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-9.0 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| Remove redundant godep commits on-top of 3e32c8333043fc2c058455f4d32986a89d31b05b. | |
| + echo 'Remove redundant godep commits on-top of 3e32c8333043fc2c058455f4d32986a89d31b05b.' | |
| + git reset --soft -q 3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/client-go | |
| + local repo=client-go | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '3e32c83 Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-9.0' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-client-go-release-9.0 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-9.0 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=3e32c8333043fc2c058455f4d32986a89d31b05b | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-client-go-release-9.0.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-client-go-release-9.0.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-client-go-release-9.0.sh --dependencies apimachinery:release-1.12,api:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api. | |
| Bumping k8s.io/api in Godeps.json from "1b7003d0d679cdd8fa4121a3304319ec4c6139f2" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/apimachinery in Godeps.json from "1b7003d0d679cdd8fa4121a3304319ec4c6139f2" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging 8ad43087cf1443662581b6c92a9f66208cc3556a as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-9.0 | |
| + '[' 3e32c8333043fc2c058455f4d32986a89d31b05b '!=' 3e32c8333043fc2c058455f4d32986a89d31b05b ']' | |
| + git checkout release-9.0 | |
| Previous HEAD position was 8ad4308... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-9.0' | |
| Your branch is ahead of 'origin/release-9.0' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| [24 Sep 18 07:42 UTC]: Successfully constructed release-9.0 | |
| [24 Sep 18 07:42 UTC]: Successfully ensured /go-workspace/src/k8s.io/apiserver exists | |
| [24 Sep 18 07:42 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 07:42 UTC]: /publish_scripts/construct.sh apiserver master master apimachinery:master,api:master,client-go:master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiserver kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiserver | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| Switching to origin/master. | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiserver master master apimachinery:master,api:master,client-go:master '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 67c89284117046b26ecd3776eed2a39289399f15 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 10 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit 67c89284117046b26ecd3776eed2a39289399f15. | |
| + echo 'Starting at existing master commit 67c89284117046b26ecd3776eed2a39289399f15.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=fe72bd20b5b9ccc1f5b2ca5a951b78715164122c | |
| + '[' -z fe72bd20b5b9ccc1f5b2ca5a951b78715164122c ']' | |
| ++ git-find-merge fe72bd20b5b9ccc1f5b2ca5a951b78715164122c upstream/master | |
| ++ tail -1 | |
| +++ git rev-list 'fe72bd20b5b9ccc1f5b2ca5a951b78715164122c^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list fe72bd20b5b9ccc1f5b2ca5a951b78715164122c..upstream/master --ancestry-path | |
| +++ git rev-parse fe72bd20b5b9ccc1f5b2ca5a951b78715164122c | |
| + local k_base_merge=fe72bd20b5b9ccc1f5b2ca5a951b78715164122c | |
| + '[' -z fe72bd20b5b9ccc1f5b2ca5a951b78715164122c ']' | |
| + git branch -f filtered-branch-base fe72bd20b5b9ccc1f5b2ca5a951b78715164122c | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/apiserver. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=56899b06983e0938df6662456286df8c821380ad | |
| ++ git log --first-parent --format=%H --reverse 56899b06983e0938df6662456286df8c821380ad..HEAD | |
| + f_mainline_commits=2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=67c89284117046b26ecd3776eed2a39289399f15 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=67c89284117046b26ecd3776eed2a39289399f15 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' 2a75d4c36790109550aec8c596e5ea9d13a61779 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| ++ kube-commit Kubernetes-commit 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%B -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + k_mainline_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git-find-merge fb50b3cb32dccce5d242f40db1d020da07fd7078 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'fb50b3cb32dccce5d242f40db1d020da07fd7078^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list fb50b3cb32dccce5d242f40db1d020da07fd7078..upstream-branch --ancestry-path | |
| +++ git rev-parse fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + k_new_pending_merge_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + '[' fb50b3cb32dccce5d242f40db1d020da07fd7078 = fb50b3cb32dccce5d242f40db1d020da07fd7078 ']' | |
| + k_new_pending_merge_commit= | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit= | |
| + '[' 2a75d4c36790109550aec8c596e5ea9d13a61779 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + '[' master '!=' master ']' | |
| + '[' master '!=' master ']' | |
| + is-merge 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=short -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + pick-merge-as-single-commit fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + grep -F -q -x fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git merge-base --octopus '2a75d4c36790109550aec8c596e5ea9d13a61779^1' '2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + local f_latest_branch_point_commit=eb82d50fb44d6e6ed294d6e291754887f61b3c20 | |
| + '[' -z eb82d50fb44d6e6ed294d6e291754887f61b3c20 ']' | |
| + local f_first_pick_base=eb82d50fb44d6e6ed294d6e291754887f61b3c20 | |
| ++ git log --merges --format=%H --ancestry-path -1 'eb82d50fb44d6e6ed294d6e291754887f61b3c20..2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + local f_latest_merge_commit= | |
| + '[' -n '' ']' | |
| ++ git log --format=%H --reverse 'eb82d50fb44d6e6ed294d6e291754887f61b3c20..2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + for f_commit in '$(git log --format='\''%H'\'' --reverse ${f_first_pick_base}..${f_mainline_commit}^2)' | |
| + local squash_commits=1 | |
| + godep-changes 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + '[' -n '' ']' | |
| + git diff --exit-code --quiet '6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3^' 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 -- Godeps/Godeps.json | |
| ++ kube-commit Kubernetes-commit 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%B -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ commit-subject 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%s -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| Cherry-picking k8s.io/kubernetes branch-commit 89f3fa3d62791e756dcbd645818ea03d7c1a86b8: use dailcontext. | |
| + echo 'Cherry-picking k8s.io/kubernetes branch-commit 89f3fa3d62791e756dcbd645818ea03d7c1a86b8: use dailcontext.' | |
| ++ commit-date 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%aD -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + GIT_COMMITTER_DATE='Fri, 24 Aug 2018 10:18:21 +0800' | |
| + git cherry-pick --keep-redundant-commits 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + squash 1 | |
| ++ git rev-parse HEAD | |
| + local head=164f30a6632ae90d9000a154dda6d02b13af631a | |
| + git reset -q --soft HEAD~1 | |
| ++ committer-date 164f30a6632ae90d9000a154dda6d02b13af631a | |
| ++ git show --format=%cD -q 164f30a6632ae90d9000a154dda6d02b13af631a | |
| + GIT_COMMITTER_DATE='Fri, 24 Aug 2018 10:18:21 +0800' | |
| + git commit --allow-empty -q -C 164f30a6632ae90d9000a154dda6d02b13af631a | |
| ++ commit-subject 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%s -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| Cherry-picking k8s.io/kubernetes branch-merge fb50b3cb32dccce5d242f40db1d020da07fd7078: Merge pull request #67793 from fisherxu/use_ctx. | |
| + echo 'Cherry-picking k8s.io/kubernetes branch-merge fb50b3cb32dccce5d242f40db1d020da07fd7078: Merge pull request #67793 from fisherxu/use_ctx.' | |
| ++ commit-date 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%aD -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + local 'date=Thu, 20 Sep 2018 20:35:36 -0700' | |
| +++ commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| +++ git show --format=%B -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ GIT_COMMITTER_DATE='Thu, 20 Sep 2018 20:35:36 -0700' | |
| ++ GIT_AUTHOR_DATE='Thu, 20 Sep 2018 20:35:36 -0700' | |
| ++ git commit-tree -p 67c89284117046b26ecd3776eed2a39289399f15 -p HEAD -m 'Merge pull request #67793 from fisherxu/use_ctx | |
| Refactor grpc dial with dialcontext | |
| Kubernetes-commit: fb50b3cb32dccce5d242f40db1d020da07fd7078' 'HEAD^{tree}' | |
| + git reset -q 2615182d0311fddbf65850bca9e767a2681c4d0d | |
| + amend-godeps-at 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + '[' -f Godeps/Godeps.json ']' | |
| + git checkout 2a75d4c36790109550aec8c596e5ea9d13a61779 Godeps/Godeps.json | |
| + git commit --amend --no-edit -q | |
| + fix-godeps apimachinery:master,api:master,client-go:master '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=c13cd3267c3902ca84866898423ccc5e89423286 | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + '[' -z fb50b3cb32dccce5d242f40db1d020da07fd7078 ']' | |
| ++ git-find-merge fb50b3cb32dccce5d242f40db1d020da07fd7078 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'fb50b3cb32dccce5d242f40db1d020da07fd7078^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list fb50b3cb32dccce5d242f40db1d020da07fd7078..upstream-branch --ancestry-path | |
| +++ git rev-parse fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + local k_last_kube_merge=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-api-master | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff' | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-client-go-master | |
| + '[' -z 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401' | |
| + git checkout -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + update-deps-in-godep-json apimachinery:master,api:master,client-go:master k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| Updating k8s.io/apimachinery dependency to 99c5fa21f87204c2875a7f7ba977895d79b35c44. | |
| + local old_dep_commit=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |
| + '[' -n xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ']' | |
| + '[' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '!=' 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + echo 'Updating k8s.io/apimachinery dependency to 99c5fa21f87204c2875a7f7ba977895d79b35c44.' | |
| + sed -i s/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/99c5fa21f87204c2875a7f7ba977895d79b35c44/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -n 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + '[' 99c5fa21f87204c2875a7f7ba977895d79b35c44 '!=' f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + echo 'Updating k8s.io/api dependency to f456898a08e4bbc5891694118f3819f324de12ff.' | |
| + sed -i s/99c5fa21f87204c2875a7f7ba977895d79b35c44/f456898a08e4bbc5891694118f3819f324de12ff/g Godeps/Godeps.json | |
| Updating k8s.io/api dependency to f456898a08e4bbc5891694118f3819f324de12ff. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| ++ cd ../client-go | |
| ++ git rev-parse HEAD | |
| + local dep_commit=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + '[' -z 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' -n f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + '[' f456898a08e4bbc5891694118f3819f324de12ff '!=' 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + echo 'Updating k8s.io/client-go dependency to 93821fae8052eae2e5ab4cac6ee2214e990e9401.' | |
| Updating k8s.io/client-go dependency to 93821fae8052eae2e5ab4cac6ee2214e990e9401. | |
| + sed -i s/f456898a08e4bbc5891694118f3819f324de12ff/93821fae8052eae2e5ab4cac6ee2214e990e9401/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Committing Godeps/Godeps.json. | |
| + return 1 | |
| + echo 'Committing Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code c13cd3267c3902ca84866898423ccc5e89423286 | |
| + '[' true = true ']' | |
| Amending last merge with godep changes. | |
| + echo 'Amending last merge with godep changes.' | |
| + git reset --soft -q c13cd3267c3902ca84866898423ccc5e89423286 | |
| + git commit -q --amend --allow-empty -C c13cd3267c3902ca84866898423ccc5e89423286 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 '!=' 67c89284117046b26ecd3776eed2a39289399f15 ']' | |
| + fix-godeps apimachinery:master,api:master,client-go:master '' k8s.io true true true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master,client-go:master k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ grep '^Kubernetes-commit: ' | |
| + local k_last_kube_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + '[' -z fb50b3cb32dccce5d242f40db1d020da07fd7078 ']' | |
| ++ git-find-merge fb50b3cb32dccce5d242f40db1d020da07fd7078 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'fb50b3cb32dccce5d242f40db1d020da07fd7078^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list fb50b3cb32dccce5d242f40db1d020da07fd7078..upstream-branch --ancestry-path | |
| +++ git rev-parse fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + local k_last_kube_merge=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-api-master | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff | |
| + echo 'Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff' | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078. | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit fb50b3cb32dccce5d242f40db1d020da07fd7078.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b fb50b3cb32dccce5d242f40db1d020da07fd7078 ../kube-commits-client-go-master | |
| + '[' -z 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + echo 'Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401' | |
| + git checkout -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + echo 'Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library.' | |
| + rm -rf ./vendor/github.com/golang/glog | |
| Removing k8s.io/*, gofuzz, go-openapi and glog from vendor/ because this is a library. | |
| + rm -rf ./vendor/k8s.io | |
| + rm -rf ./vendor/github.com/google/gofuzz | |
| + rm -rf ./vendor/github.com/go-openapi | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 | |
| Amending last merge with godep changes. | |
| + '[' true = true ']' | |
| + echo 'Amending last merge with godep changes.' | |
| + git reset --soft -q c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 | |
| + git commit -q --amend --allow-empty -C c7486a79fa91a408bfd00dd02e6bdfaeb9685c69 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + local repo=apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'f3682c1 Merge pull request #67793 from fisherxu/use_ctx' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=f3682c1ab73d7ea1bd6fc22d81a44e345afb672d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiserver-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiserver-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-apiserver-master.sh --dependencies apimachinery:master,api:master,client-go:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' f3682c1ab73d7ea1bd6fc22d81a44e345afb672d '!=' f3682c1ab73d7ea1bd6fc22d81a44e345afb672d ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| [24 Sep 18 07:47 UTC]: Successfully constructed master | |
| [24 Sep 18 07:47 UTC]: /publish_scripts/construct.sh apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiserver kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiserver | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| Cleaning up checkout. | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q f3682c1ab73d7ea1bd6fc22d81a44e345afb672d | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 7 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit b2fdecc78668ca10ae83e151a11d8c4cbfce9431. | |
| + echo 'Starting at existing release-1.9 commit b2fdecc78668ca10ae83e151a11d8c4cbfce9431.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ head -n 1 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| ++ git-find-merge da2670acf516d03b4e8b9889f403602669704507 upstream/release-1.9 | |
| ++ tail -1 | |
| +++ git rev-list 'da2670acf516d03b4e8b9889f403602669704507^1..upstream/release-1.9' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list da2670acf516d03b4e8b9889f403602669704507..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse da2670acf516d03b4e8b9889f403602669704507 | |
| + local k_base_merge=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| + git branch -f filtered-branch-base da2670acf516d03b4e8b9889f403602669704507 | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apiserver. | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=47cdf291281714babeaa632533ef75481118e444 | |
| ++ git log --first-parent --format=%H --reverse 47cdf291281714babeaa632533ef75481118e444..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' b2fdecc78668ca10ae83e151a11d8c4cbfce9431 '!=' b2fdecc78668ca10ae83e151a11d8c4cbfce9431 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=da2670acf516d03b4e8b9889f403602669704507 | |
| + '[' -z da2670acf516d03b4e8b9889f403602669704507 ']' | |
| ++ git-find-merge da2670acf516d03b4e8b9889f403602669704507 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'da2670acf516d03b4e8b9889f403602669704507^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list da2670acf516d03b4e8b9889f403602669704507..upstream-branch --ancestry-path | |
| +++ git rev-parse da2670acf516d03b4e8b9889f403602669704507 | |
| + local k_last_kube_merge=da2670acf516d03b4e8b9889f403602669704507 | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507. | |
| ++ look -b da2670acf516d03b4e8b9889f403602669704507 ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507. | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b da2670acf516d03b4e8b9889f403602669704507 ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=release-6.0 | |
| + echo 'Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit da2670acf516d03b4e8b9889f403602669704507. | |
| ++ look -b da2670acf516d03b4e8b9889f403602669704507 ../kube-commits-client-go-release-6.0 | |
| + '[' -z 115d23201cc1aa2260c19f8f6bb79d400d123dbd ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 115d23201cc1aa2260c19f8f6bb79d400d123dbd' | |
| Checking out k8s.io/client-go to 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + git checkout -q 115d23201cc1aa2260c19f8f6bb79d400d123dbd | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-1.9 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Godeps.json hasn't changed! | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| Remove redundant godep commits on-top of b2fdecc78668ca10ae83e151a11d8c4cbfce9431. | |
| + echo 'Remove redundant godep commits on-top of b2fdecc78668ca10ae83e151a11d8c4cbfce9431.' | |
| + git reset --soft -q b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + local repo=apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'b2fdecc Merge pull request #67162 from dekkagaijin/automated-cherry-pick-of-#65799-upstream-release-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiserver-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiserver-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-apiserver-release-1.9.sh --dependencies apimachinery:release-1.9,api:release-1.9,client-go:release-6.0 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' b2fdecc78668ca10ae83e151a11d8c4cbfce9431 '!=' b2fdecc78668ca10ae83e151a11d8c4cbfce9431 ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 07:50 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 07:50 UTC]: /publish_scripts/construct.sh apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiserver kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiserver | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q b2fdecc78668ca10ae83e151a11d8c4cbfce9431 | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 88d4601515c27f180f7efc8705e4cc18dc19100d | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 7 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit 88d4601515c27f180f7efc8705e4cc18dc19100d. | |
| + echo 'Starting at existing release-1.10 commit 88d4601515c27f180f7efc8705e4cc18dc19100d.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=0716812be5b019688be32ad77884b4e90d53d515 | |
| + '[' -z 0716812be5b019688be32ad77884b4e90d53d515 ']' | |
| ++ git-find-merge 0716812be5b019688be32ad77884b4e90d53d515 upstream/release-1.10 | |
| ++ tail -1 | |
| +++ git rev-list '0716812be5b019688be32ad77884b4e90d53d515^1..upstream/release-1.10' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 0716812be5b019688be32ad77884b4e90d53d515..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse 0716812be5b019688be32ad77884b4e90d53d515 | |
| + local k_base_merge=0716812be5b019688be32ad77884b4e90d53d515 | |
| + '[' -z 0716812be5b019688be32ad77884b4e90d53d515 ']' | |
| + git branch -f filtered-branch-base 0716812be5b019688be32ad77884b4e90d53d515 | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apiserver. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Running git filter-branch ... | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=d84a8f36b58efd90732596337deffc55fb45b208 | |
| ++ git log --first-parent --format=%H --reverse d84a8f36b58efd90732596337deffc55fb45b208..HEAD | |
| Checking out branch release-1.10. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 88d4601515c27f180f7efc8705e4cc18dc19100d '!=' 88d4601515c27f180f7efc8705e4cc18dc19100d ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=0716812be5b019688be32ad77884b4e90d53d515 | |
| + '[' -z 0716812be5b019688be32ad77884b4e90d53d515 ']' | |
| ++ git-find-merge 0716812be5b019688be32ad77884b4e90d53d515 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '0716812be5b019688be32ad77884b4e90d53d515^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 0716812be5b019688be32ad77884b4e90d53d515..upstream-branch --ancestry-path | |
| +++ git rev-parse 0716812be5b019688be32ad77884b4e90d53d515 | |
| + local k_last_kube_merge=0716812be5b019688be32ad77884b4e90d53d515 | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515. | |
| ++ look -b 0716812be5b019688be32ad77884b4e90d53d515 ../kube-commits-apimachinery-release-1.10 | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515. | |
| ++ look -b 0716812be5b019688be32ad77884b4e90d53d515 ../kube-commits-api-release-1.10 | |
| + '[' -z 12444147eb1150aa5c80d2aae532cbc5b7be73d0 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 12444147eb1150aa5c80d2aae532cbc5b7be73d0' | |
| + git checkout -q 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| Checking out k8s.io/api to 12444147eb1150aa5c80d2aae532cbc5b7be73d0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515. | |
| + local dep=client-go | |
| + local branch=release-7.0 | |
| + echo 'Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 0716812be5b019688be32ad77884b4e90d53d515.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 0716812be5b019688be32ad77884b4e90d53d515 ../kube-commits-client-go-release-7.0 | |
| + '[' -z 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + echo 'Checking out k8s.io/client-go to 745ca830039794f7b927b8a2c2a58dcc1e8a0a72' | |
| + git checkout -q 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + echo 'Remove redundant godep commits on-top of 88d4601515c27f180f7efc8705e4cc18dc19100d.' | |
| + git reset --soft -q 88d4601515c27f180f7efc8705e4cc18dc19100d | |
| Remove redundant godep commits on-top of 88d4601515c27f180f7efc8705e4cc18dc19100d. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + local repo=apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '88d4601 Merge pull request #67821 from sylr/automated-cherry-pick-of-#67298-sylr-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiserver-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiserver-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-apiserver-release-1.10.sh --dependencies apimachinery:release-1.10,api:release-1.10,client-go:release-7.0 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' 88d4601515c27f180f7efc8705e4cc18dc19100d '!=' 88d4601515c27f180f7efc8705e4cc18dc19100d ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 07:53 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 07:53 UTC]: /publish_scripts/construct.sh apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiserver kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiserver | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 88d4601515c27f180f7efc8705e4cc18dc19100d | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 9 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit d296c96c12b7d15d7fb5fea7a05fb165f8fd4014. | |
| + echo 'Starting at existing release-1.11 commit d296c96c12b7d15d7fb5fea7a05fb165f8fd4014.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ head -n 1 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apiserver. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=13a431b7ab2af183650f2ddc2c12f8eb07ea3d68 | |
| ++ git log --first-parent --format=%H --reverse 13a431b7ab2af183650f2ddc2c12f8eb07ea3d68..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 '!=' d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 '' k8s.io true true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f' | |
| + git checkout -q def12e63c512da17043b4f0293f52d1006603d9f | |
| Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-api-release-1.11 | |
| + '[' -z 4e7be11eab3ffcfc1876898b8272df53785a9504 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504' | |
| + git checkout -q 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=release-8.0 | |
| + echo 'Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-client-go-release-8.0 | |
| + '[' -z f2f85107cac6fe04c30435ca0ac0c3318fd1b94c ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c' | |
| + git checkout -q f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| Godeps.json hasn't changed! | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| Remove redundant godep commits on-top of d296c96c12b7d15d7fb5fea7a05fb165f8fd4014. | |
| + echo 'Remove redundant godep commits on-top of d296c96c12b7d15d7fb5fea7a05fb165f8fd4014.' | |
| + git reset --soft -q d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + local repo=apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.11 | |
| + '[' -n 'd296c96 Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.11' | |
| ++ sed 's/^./\L\u&/' | |
| ++ echo kubernetes | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiserver-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiserver-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-apiserver-release-1.11.sh --dependencies apimachinery:release-1.11,api:release-1.11,client-go:release-8.0 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 '!=' d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 07:57 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 07:57 UTC]: /publish_scripts/construct.sh apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiserver kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiserver | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 737bdad08779ddde1481ae9c589a00ce3b4fb746 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 9 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 737bdad08779ddde1481ae9c589a00ce3b4fb746. | |
| + echo 'Starting at existing release-1.12 commit 737bdad08779ddde1481ae9c589a00ce3b4fb746.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=e231c3ca1f15fe96f8b73201160e25fc5968f63d | |
| + '[' -z e231c3ca1f15fe96f8b73201160e25fc5968f63d ']' | |
| ++ git-find-merge e231c3ca1f15fe96f8b73201160e25fc5968f63d upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'e231c3ca1f15fe96f8b73201160e25fc5968f63d^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list e231c3ca1f15fe96f8b73201160e25fc5968f63d..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse e231c3ca1f15fe96f8b73201160e25fc5968f63d | |
| + local k_base_merge=e231c3ca1f15fe96f8b73201160e25fc5968f63d | |
| + '[' -z e231c3ca1f15fe96f8b73201160e25fc5968f63d ']' | |
| + git branch -f filtered-branch-base e231c3ca1f15fe96f8b73201160e25fc5968f63d | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apiserver. | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| Running git filter-branch ... | |
| + local subdirectory=staging/src/k8s.io/apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=56899b06983e0938df6662456286df8c821380ad | |
| ++ git log --first-parent --format=%H --reverse 56899b06983e0938df6662456286df8c821380ad..HEAD | |
| + f_mainline_commits=2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=737bdad08779ddde1481ae9c589a00ce3b4fb746 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=737bdad08779ddde1481ae9c589a00ce3b4fb746 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' 2a75d4c36790109550aec8c596e5ea9d13a61779 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| ++ kube-commit Kubernetes-commit 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%B -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + k_mainline_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git-find-merge fb50b3cb32dccce5d242f40db1d020da07fd7078 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'fb50b3cb32dccce5d242f40db1d020da07fd7078^1..upstream-branch' --first-parent | |
| +++ git rev-list fb50b3cb32dccce5d242f40db1d020da07fd7078..upstream-branch --ancestry-path | |
| +++ git rev-parse fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + k_new_pending_merge_commit=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + '[' 5a80e28431c7469d677c5b17277266d1da4e5c8d = fb50b3cb32dccce5d242f40db1d020da07fd7078 ']' | |
| + '[' release-1.12 '!=' master ']' | |
| + is-merge-with-master fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git show --format=short -q fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + return 1 | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + '[' 2a75d4c36790109550aec8c596e5ea9d13a61779 = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + '[' release-1.12 '!=' master ']' | |
| + is-merge-with-master fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git show --format=short -q fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + return 1 | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -n 5a80e28431c7469d677c5b17277266d1da4e5c8d ']' | |
| + is-merge-with-master 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| ++ git show --format=short -q 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + return 1 | |
| + is-merge 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=short -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + pick-merge-as-single-commit fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + grep -F -q -x fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| ++ git merge-base --octopus '2a75d4c36790109550aec8c596e5ea9d13a61779^1' '2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + local f_latest_branch_point_commit=eb82d50fb44d6e6ed294d6e291754887f61b3c20 | |
| + '[' -z eb82d50fb44d6e6ed294d6e291754887f61b3c20 ']' | |
| + local f_first_pick_base=eb82d50fb44d6e6ed294d6e291754887f61b3c20 | |
| ++ git log --merges --format=%H --ancestry-path -1 'eb82d50fb44d6e6ed294d6e291754887f61b3c20..2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + local f_latest_merge_commit= | |
| + '[' -n '' ']' | |
| ++ git log --format=%H --reverse 'eb82d50fb44d6e6ed294d6e291754887f61b3c20..2a75d4c36790109550aec8c596e5ea9d13a61779^2' | |
| + for f_commit in '$(git log --format='\''%H'\'' --reverse ${f_first_pick_base}..${f_mainline_commit}^2)' | |
| + local squash_commits=1 | |
| + godep-changes 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + '[' -n '' ']' | |
| + git diff --exit-code --quiet '6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3^' 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 -- Godeps/Godeps.json | |
| ++ kube-commit Kubernetes-commit 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ commit-message 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%B -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ commit-subject 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%s -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + echo 'Cherry-picking k8s.io/kubernetes branch-commit 89f3fa3d62791e756dcbd645818ea03d7c1a86b8: use dailcontext.' | |
| Cherry-picking k8s.io/kubernetes branch-commit 89f3fa3d62791e756dcbd645818ea03d7c1a86b8: use dailcontext. | |
| ++ commit-date 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| ++ git show --format=%aD -q 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + GIT_COMMITTER_DATE='Fri, 24 Aug 2018 10:18:21 +0800' | |
| + git cherry-pick --keep-redundant-commits 6f3c0b5beaeca1f4a9c5e348857fe2d82d80ece3 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + squash 1 | |
| ++ git rev-parse HEAD | |
| + local head=bb74dd0ac3a478cef60046bf8bfc1c10833ddd38 | |
| + git reset -q --soft HEAD~1 | |
| ++ committer-date bb74dd0ac3a478cef60046bf8bfc1c10833ddd38 | |
| ++ git show --format=%cD -q bb74dd0ac3a478cef60046bf8bfc1c10833ddd38 | |
| + GIT_COMMITTER_DATE='Fri, 24 Aug 2018 10:18:21 +0800' | |
| + git commit --allow-empty -q -C bb74dd0ac3a478cef60046bf8bfc1c10833ddd38 | |
| ++ commit-subject 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%s -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| Cherry-picking k8s.io/kubernetes branch-merge fb50b3cb32dccce5d242f40db1d020da07fd7078: Merge pull request #67793 from fisherxu/use_ctx. | |
| + echo 'Cherry-picking k8s.io/kubernetes branch-merge fb50b3cb32dccce5d242f40db1d020da07fd7078: Merge pull request #67793 from fisherxu/use_ctx.' | |
| ++ commit-date 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ git show --format=%aD -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + local 'date=Thu, 20 Sep 2018 20:35:36 -0700' | |
| +++ commit-message 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| +++ git show --format=%B -q 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| ++ GIT_COMMITTER_DATE='Thu, 20 Sep 2018 20:35:36 -0700' | |
| ++ GIT_AUTHOR_DATE='Thu, 20 Sep 2018 20:35:36 -0700' | |
| ++ git commit-tree -p 737bdad08779ddde1481ae9c589a00ce3b4fb746 -p HEAD -m 'Merge pull request #67793 from fisherxu/use_ctx | |
| Refactor grpc dial with dialcontext | |
| Kubernetes-commit: fb50b3cb32dccce5d242f40db1d020da07fd7078' 'HEAD^{tree}' | |
| + git reset -q 59423790640baca5a2c0cad43d24d0fedaf7945f | |
| + amend-godeps-at 2a75d4c36790109550aec8c596e5ea9d13a61779 | |
| + '[' -f Godeps/Godeps.json ']' | |
| + git checkout 2a75d4c36790109550aec8c596e5ea9d13a61779 Godeps/Godeps.json | |
| + git commit --amend --no-edit -q | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=2931e10b393a6d4661cec39e563817449e3aaf6d | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + '[' -z fb50b3cb32dccce5d242f40db1d020da07fd7078 ']' | |
| ++ git-find-merge fb50b3cb32dccce5d242f40db1d020da07fd7078 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'fb50b3cb32dccce5d242f40db1d020da07fd7078^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list fb50b3cb32dccce5d242f40db1d020da07fd7078..upstream-branch --ancestry-path | |
| +++ git rev-parse fb50b3cb32dccce5d242f40db1d020da07fd7078 | |
| + local k_last_kube_merge=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08 | |
| + echo 'Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08' | |
| + git checkout -q 705814234c8085247e99946887b0fbbd801efa08 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-api-release-1.12 | |
| + '[' -z 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + echo 'Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2' | |
| + git checkout -q 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-client-go-release-9.0 | |
| + '[' -z 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0' | |
| Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + git checkout -q 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + update-deps-in-godep-json apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=705814234c8085247e99946887b0fbbd801efa08 | |
| + '[' -z 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |
| + '[' -n xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ']' | |
| + '[' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '!=' 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| Updating k8s.io/apimachinery dependency to 705814234c8085247e99946887b0fbbd801efa08. | |
| + echo 'Updating k8s.io/apimachinery dependency to 705814234c8085247e99946887b0fbbd801efa08.' | |
| + sed -i s/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/705814234c8085247e99946887b0fbbd801efa08/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + '[' -z 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=705814234c8085247e99946887b0fbbd801efa08 | |
| + '[' -n 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + '[' 705814234c8085247e99946887b0fbbd801efa08 '!=' 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + echo 'Updating k8s.io/api dependency to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2.' | |
| + sed -i s/705814234c8085247e99946887b0fbbd801efa08/1b7003d0d679cdd8fa4121a3304319ec4c6139f2/g Godeps/Godeps.json | |
| Updating k8s.io/api dependency to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| ++ cd ../client-go | |
| ++ git rev-parse HEAD | |
| + local dep_commit=1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + '[' -z 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + '[' -n 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + '[' 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 '!=' 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + echo 'Updating k8s.io/client-go dependency to 1fb328fb332660c905cbe8c5a498135b0630ebd0.' | |
| + sed -i s/1b7003d0d679cdd8fa4121a3304319ec4c6139f2/1fb328fb332660c905cbe8c5a498135b0630ebd0/g Godeps/Godeps.json | |
| Updating k8s.io/client-go dependency to 1fb328fb332660c905cbe8c5a498135b0630ebd0. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 2931e10b393a6d4661cec39e563817449e3aaf6d | |
| Amending last merge with godep changes. | |
| + '[' true = true ']' | |
| + echo 'Amending last merge with godep changes.' | |
| + git reset --soft -q 2931e10b393a6d4661cec39e563817449e3aaf6d | |
| + git commit -q --amend --allow-empty -C 2931e10b393a6d4661cec39e563817449e3aaf6d | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=8b9bf8b5e7a12a4c493fdba7eeba1ab15bc883ee | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n 5a80e28431c7469d677c5b17277266d1da4e5c8d ']' | |
| + '[' FLUSH_PENDING_MERGE_COMMIT '!=' 5a80e28431c7469d677c5b17277266d1da4e5c8d ']' | |
| + local dst_parent2=HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + is-merge-with-master 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + grep -q '^Merge remote-tracking branch '\''origin/master'\''' | |
| ++ short-commit-message 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| ++ git show --format=short -q 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + return 1 | |
| ++ commit-subject 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| ++ git show --format=%s -q 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + echo 'Cherry-picking source dropped-merge 5a80e28431c7469d677c5b17277266d1da4e5c8d: Merge remote-tracking branch '\''origin/master'\'' into release-1.12.' | |
| Cherry-picking source dropped-merge 5a80e28431c7469d677c5b17277266d1da4e5c8d: Merge remote-tracking branch 'origin/master' into release-1.12. | |
| ++ commit-date 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| ++ git show --format=%aD -q 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local 'date=Fri, 21 Sep 2018 14:44:59 -0700' | |
| +++ commit-message 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| +++ git show --format=%B -q 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| +++ echo | |
| +++ echo 'Kubernetes-commit: 5a80e28431c7469d677c5b17277266d1da4e5c8d' | |
| ++ GIT_COMMITTER_DATE='Fri, 21 Sep 2018 14:44:59 -0700' | |
| ++ GIT_AUTHOR_DATE='Fri, 21 Sep 2018 14:44:59 -0700' | |
| ++ git commit-tree -p 8b9bf8b5e7a12a4c493fdba7eeba1ab15bc883ee -p HEAD -m 'Merge remote-tracking branch '\''origin/master'\'' into release-1.12 | |
| Kubernetes-commit: 5a80e28431c7469d677c5b17277266d1da4e5c8d' 'HEAD^{tree}' | |
| error: duplicate parent 8b9bf8b5e7a12a4c493fdba7eeba1ab15bc883ee ignored | |
| + local dst_new_merge=671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + git reset -q --hard 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + '[' -z 5a80e28431c7469d677c5b17277266d1da4e5c8d ']' | |
| ++ git-find-merge 5a80e28431c7469d677c5b17277266d1da4e5c8d upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '5a80e28431c7469d677c5b17277266d1da4e5c8d^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5a80e28431c7469d677c5b17277266d1da4e5c8d..upstream-branch --ancestry-path | |
| +++ git rev-parse 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local k_last_kube_merge=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08 | |
| + echo 'Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08' | |
| + git checkout -q 705814234c8085247e99946887b0fbbd801efa08 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-api-release-1.12 | |
| + '[' -z 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2' | |
| Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + git checkout -q 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-client-go-release-9.0 | |
| + '[' -z 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0' | |
| + git checkout -q 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + update-deps-in-godep-json apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=705814234c8085247e99946887b0fbbd801efa08 | |
| + '[' -z 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + '[' -n 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + '[' 1fb328fb332660c905cbe8c5a498135b0630ebd0 '!=' 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + echo 'Updating k8s.io/apimachinery dependency to 705814234c8085247e99946887b0fbbd801efa08.' | |
| + sed -i s/1fb328fb332660c905cbe8c5a498135b0630ebd0/705814234c8085247e99946887b0fbbd801efa08/g Godeps/Godeps.json | |
| Updating k8s.io/apimachinery dependency to 705814234c8085247e99946887b0fbbd801efa08. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + '[' -z 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=705814234c8085247e99946887b0fbbd801efa08 | |
| + '[' -n 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + '[' 705814234c8085247e99946887b0fbbd801efa08 '!=' 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + echo 'Updating k8s.io/api dependency to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2.' | |
| + sed -i s/705814234c8085247e99946887b0fbbd801efa08/1b7003d0d679cdd8fa4121a3304319ec4c6139f2/g Godeps/Godeps.json | |
| Updating k8s.io/api dependency to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| ++ cd ../client-go | |
| ++ git rev-parse HEAD | |
| + local dep_commit=1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + '[' -z 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + '[' -n 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + '[' 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 '!=' 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + echo 'Updating k8s.io/client-go dependency to 1fb328fb332660c905cbe8c5a498135b0630ebd0.' | |
| + sed -i s/1b7003d0d679cdd8fa4121a3304319ec4c6139f2/1fb328fb332660c905cbe8c5a498135b0630ebd0/g Godeps/Godeps.json | |
| Updating k8s.io/client-go dependency to 1fb328fb332660c905cbe8c5a498135b0630ebd0. | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| Remove redundant godep commits on-top of 671af2e9fe976a3d1279bcaa2aed21a5c5050db2. | |
| + echo 'Remove redundant godep commits on-top of 671af2e9fe976a3d1279bcaa2aed21a5c5050db2.' | |
| + git reset --soft -q 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 '!=' 737bdad08779ddde1481ae9c589a00ce3b4fb746 ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 '' k8s.io true true true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=true | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 k8s.io true Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + '[' -z 5a80e28431c7469d677c5b17277266d1da4e5c8d ']' | |
| ++ git-find-merge 5a80e28431c7469d677c5b17277266d1da4e5c8d upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '5a80e28431c7469d677c5b17277266d1da4e5c8d^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5a80e28431c7469d677c5b17277266d1da4e5c8d..upstream-branch --ancestry-path | |
| +++ git rev-parse 5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local k_last_kube_merge=5a80e28431c7469d677c5b17277266d1da4e5c8d | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 705814234c8085247e99946887b0fbbd801efa08 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08 | |
| + echo 'Checking out k8s.io/apimachinery to 705814234c8085247e99946887b0fbbd801efa08' | |
| + git checkout -q 705814234c8085247e99946887b0fbbd801efa08 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-api-release-1.12 | |
| + '[' -z 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2' | |
| Checking out k8s.io/api to 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + git checkout -q 1b7003d0d679cdd8fa4121a3304319ec4c6139f2 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5a80e28431c7469d677c5b17277266d1da4e5c8d. | |
| ++ look -b 5a80e28431c7469d677c5b17277266d1da4e5c8d ../kube-commits-client-go-release-9.0 | |
| + '[' -z 1fb328fb332660c905cbe8c5a498135b0630ebd0 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + echo 'Checking out k8s.io/client-go to 1fb328fb332660c905cbe8c5a498135b0630ebd0' | |
| + git checkout -q 1fb328fb332660c905cbe8c5a498135b0630ebd0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' true = true ']' | |
| ++ git rev-parse --abbrev-ref HEAD | |
| Removing complete vendor/ on non-master branch because this is a library. | |
| + '[' release-1.12 '!=' master ']' | |
| + echo 'Removing complete vendor/ on non-master branch because this is a library.' | |
| + rm -rf vendor/ | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + true | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| Amending last merge with godep changes. | |
| + '[' true = true ']' | |
| + echo 'Amending last merge with godep changes.' | |
| + git reset --soft -q 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + git commit -q --amend --allow-empty -C 671af2e9fe976a3d1279bcaa2aed21a5c5050db2 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiserver | |
| + local repo=apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '8b9bf8b Merge pull request #67793 from fisherxu/use_ctx' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiserver-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=a22ac86f43be926cd2c914f3038087078c3b448d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiserver-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiserver-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-apiserver-release-1.12.sh --dependencies apimachinery:release-1.12,api:release-1.12,client-go:release-9.0 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api, client-go. | |
| Bumping k8s.io/api in Godeps.json from "1b7003d0d679cdd8fa4121a3304319ec4c6139f2" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/client-go in Godeps.json from "1fb328fb332660c905cbe8c5a498135b0630ebd0" to kubernetes-1.12.0-rc.2: "8ad43087cf1443662581b6c92a9f66208cc3556a". | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging d9d60f3d1def56591b8695b83c2c4f2f649f7c42 as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' a22ac86f43be926cd2c914f3038087078c3b448d '!=' a22ac86f43be926cd2c914f3038087078c3b448d ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was d9d60f3... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is ahead of 'origin/release-1.12' by 3 commits. | |
| (use "git push" to publish your local commits) | |
| [24 Sep 18 08:01 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 08:01 UTC]: Successfully ensured /go-workspace/src/k8s.io/kube-aggregator exists | |
| [24 Sep 18 08:01 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 08:01 UTC]: /publish_scripts/construct.sh kube-aggregator master master apimachinery:master,api:master,client-go:master,apiserver:master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/kube-aggregator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=kube-aggregator | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master,apiserver:master | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/kube-aggregator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/kube-aggregator master master apimachinery:master,api:master,client-go:master,apiserver:master '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 12 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a. | |
| + echo 'Starting at existing master commit 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream/master --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_base_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| + git branch -f filtered-branch-base 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/kube-aggregator. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/kube-aggregator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/kube-aggregator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/kube-aggregator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=d52eeae372177666a484f305475f98f90edfee90 | |
| ++ git log --first-parent --format=%H --reverse d52eeae372177666a484f305475f98f90edfee90..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a '!=' 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:master,api:master,client-go:master,apiserver:master '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master,client-go:master,apiserver:master k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/kube-aggregator/") or . == "k8s.io/kube-aggregator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master,apiserver:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream-branch --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_last_kube_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-api-master | |
| + '[' -z 49f236fe119e127d67dec93a9d41ae1c5ed5079e ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + echo 'Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e' | |
| + git checkout -q 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-client-go-master | |
| + '[' -z 37c3c02ec96533daec0dbda1f39a6b1d68505c79 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79' | |
| + git checkout -q 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=apiserver | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apiserver-master | |
| + '[' -z 3bfd32753e74188b22f853117029bfc4360272c7 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7' | |
| Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + git checkout -q 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| Remove redundant godep commits on-top of 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a. | |
| + echo 'Remove redundant godep commits on-top of 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a.' | |
| + git reset --soft -q 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + local repo=kube-aggregator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '14b8d2d Merge pull request #68442 from CaoShuFeng/json-patch' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-kube-aggregator-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-kube-aggregator-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-kube-aggregator-master.sh --dependencies apimachinery:master,api:master,client-go:master,apiserver:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a '!=' 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 08:04 UTC]: Successfully constructed master | |
| [24 Sep 18 08:04 UTC]: /publish_scripts/construct.sh kube-aggregator release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/kube-aggregator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=kube-aggregator | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/kube-aggregator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 14b8d2d93fcb8a90c47fcd2ceea0035dfd6d381a | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/kube-aggregator release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 9 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit e9475e49a2f9195a15eeeeb015eec7e62b3042d7. | |
| + echo 'Starting at existing release-1.9 commit e9475e49a2f9195a15eeeeb015eec7e62b3042d7.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream/release-1.9 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream/release-1.9' --first-parent | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_base_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| + git branch -f filtered-branch-base f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/kube-aggregator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/kube-aggregator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/kube-aggregator. | |
| Running git filter-branch ... | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/kube-aggregator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=fd56353f94a75c94f46bed9e1d05afe6c61ca464 | |
| ++ git log --first-parent --format=%H --reverse fd56353f94a75c94f46bed9e1d05afe6c61ca464..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' e9475e49a2f9195a15eeeeb015eec7e62b3042d7 '!=' e9475e49a2f9195a15eeeeb015eec7e62b3042d7 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/kube-aggregator/") or . == "k8s.io/kube-aggregator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream-branch --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_last_kube_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-6.0 | |
| + echo 'Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-client-go-release-6.0 | |
| + '[' -z e2680bfa771859c129bc5c8413fdb565af2b3dcd ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd' | |
| + git checkout -q e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=apiserver | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-apiserver-release-1.9 | |
| + '[' -z 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a' | |
| + git checkout -q 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a | |
| Checking out k8s.io/apiserver to 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| Remove redundant godep commits on-top of e9475e49a2f9195a15eeeeb015eec7e62b3042d7. | |
| + echo 'Remove redundant godep commits on-top of e9475e49a2f9195a15eeeeb015eec7e62b3042d7.' | |
| + git reset --soft -q e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + local repo=kube-aggregator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'e9475e4 Merge pull request #65298 from nikhita/cherrypick-jsoniter-bump-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-kube-aggregator-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-kube-aggregator-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-kube-aggregator-release-1.9.sh --dependencies apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' e9475e49a2f9195a15eeeeb015eec7e62b3042d7 '!=' e9475e49a2f9195a15eeeeb015eec7e62b3042d7 ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 08:07 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 08:07 UTC]: /publish_scripts/construct.sh kube-aggregator release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/kube-aggregator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=kube-aggregator | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/kube-aggregator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| Cleaning up checkout. | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q e9475e49a2f9195a15eeeeb015eec7e62b3042d7 | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/kube-aggregator release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 11 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit d29de253f8ba40ab4f8ee7eb50b522c0d83caff2. | |
| + echo 'Starting at existing release-1.10 commit d29de253f8ba40ab4f8ee7eb50b522c0d83caff2.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + '[' -z d92bf85b3cc01089401e80bb487d3bc2c010df6e ']' | |
| ++ git-find-merge d92bf85b3cc01089401e80bb487d3bc2c010df6e upstream/release-1.10 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'd92bf85b3cc01089401e80bb487d3bc2c010df6e^1..upstream/release-1.10' --first-parent | |
| +++ git rev-list d92bf85b3cc01089401e80bb487d3bc2c010df6e..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + local k_base_merge=d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + '[' -z d92bf85b3cc01089401e80bb487d3bc2c010df6e ']' | |
| + git branch -f filtered-branch-base d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/kube-aggregator. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/kube-aggregator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/kube-aggregator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| Running git filter-branch ... | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/kube-aggregator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=b7be8fac15a0b124a55cbfb2809f749f362a763b | |
| ++ git log --first-parent --format=%H --reverse b7be8fac15a0b124a55cbfb2809f749f362a763b..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 '!=' d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/kube-aggregator/") or . == "k8s.io/kube-aggregator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + '[' -z d92bf85b3cc01089401e80bb487d3bc2c010df6e ']' | |
| ++ git-find-merge d92bf85b3cc01089401e80bb487d3bc2c010df6e upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'd92bf85b3cc01089401e80bb487d3bc2c010df6e^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list d92bf85b3cc01089401e80bb487d3bc2c010df6e..upstream-branch --ancestry-path | |
| +++ git rev-parse d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + local k_last_kube_merge=d92bf85b3cc01089401e80bb487d3bc2c010df6e | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e.' | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b d92bf85b3cc01089401e80bb487d3bc2c010df6e ../kube-commits-apimachinery-release-1.10 | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e. | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b d92bf85b3cc01089401e80bb487d3bc2c010df6e ../kube-commits-api-release-1.10 | |
| + '[' -z 0f11257a8a25954878633ebdc9841c67d8f83bdb ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 0f11257a8a25954878633ebdc9841c67d8f83bdb' | |
| + git checkout -q 0f11257a8a25954878633ebdc9841c67d8f83bdb | |
| Checking out k8s.io/api to 0f11257a8a25954878633ebdc9841c67d8f83bdb | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-7.0 | |
| + echo 'Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e. | |
| ++ look -b d92bf85b3cc01089401e80bb487d3bc2c010df6e ../kube-commits-client-go-release-7.0 | |
| + '[' -z 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + echo 'Checking out k8s.io/client-go to 745ca830039794f7b927b8a2c2a58dcc1e8a0a72' | |
| + git checkout -q 745ca830039794f7b927b8a2c2a58dcc1e8a0a72 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=apiserver | |
| + local branch=release-1.10 | |
| Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e. | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit d92bf85b3cc01089401e80bb487d3bc2c010df6e.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b d92bf85b3cc01089401e80bb487d3bc2c010df6e ../kube-commits-apiserver-release-1.10 | |
| + '[' -z 2a84596e9aad63b1c1d47491d506a64465b5e2fc ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 2a84596e9aad63b1c1d47491d506a64465b5e2fc' | |
| + git checkout -q 2a84596e9aad63b1c1d47491d506a64465b5e2fc | |
| Checking out k8s.io/apiserver to 2a84596e9aad63b1c1d47491d506a64465b5e2fc | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Godeps.json hasn't changed! | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| Remove redundant godep commits on-top of d29de253f8ba40ab4f8ee7eb50b522c0d83caff2. | |
| + echo 'Remove redundant godep commits on-top of d29de253f8ba40ab4f8ee7eb50b522c0d83caff2.' | |
| + git reset --soft -q d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + local repo=kube-aggregator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'd29de25 Merge pull request #67155 from liggitt/automated-cherry-pick-of-#66932-upstream-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-kube-aggregator-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-kube-aggregator-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| ++ echo kubernetes | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-kube-aggregator-release-1.10.sh --dependencies apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 '!=' d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 08:09 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 08:09 UTC]: /publish_scripts/construct.sh kube-aggregator release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/kube-aggregator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=kube-aggregator | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/kube-aggregator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Running garbage collection. | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q d29de253f8ba40ab4f8ee7eb50b522c0d83caff2 | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/kube-aggregator release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 12 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit efa32eb095fe7c84e4b6b8b46c57d59679caf207. | |
| + echo 'Starting at existing release-1.11 commit efa32eb095fe7c84e4b6b8b46c57d59679caf207.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/kube-aggregator. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/kube-aggregator.' | |
| Running git filter-branch ... | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/kube-aggregator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/kube-aggregator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=5f4c3d0a19fba085c1382c667c387b41b1cf5985 | |
| ++ git log --first-parent --format=%H --reverse 5f4c3d0a19fba085c1382c667c387b41b1cf5985..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' efa32eb095fe7c84e4b6b8b46c57d59679caf207 '!=' efa32eb095fe7c84e4b6b8b46c57d59679caf207 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/kube-aggregator/") or . == "k8s.io/kube-aggregator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| ++ tail -1 | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f' | |
| + git checkout -q def12e63c512da17043b4f0293f52d1006603d9f | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-api-release-1.11 | |
| + '[' -z 4e7be11eab3ffcfc1876898b8272df53785a9504 ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + echo 'Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504' | |
| + git checkout -q 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-8.0 | |
| + echo 'Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-client-go-release-8.0 | |
| + '[' -z f2f85107cac6fe04c30435ca0ac0c3318fd1b94c ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c' | |
| Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + git checkout -q f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=apiserver | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apiserver-release-1.11 | |
| + '[' -z d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to d296c96c12b7d15d7fb5fea7a05fb165f8fd4014' | |
| + git checkout -q d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| Checking out k8s.io/apiserver to d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Godeps.json hasn't changed! | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| Remove redundant godep commits on-top of efa32eb095fe7c84e4b6b8b46c57d59679caf207. | |
| + echo 'Remove redundant godep commits on-top of efa32eb095fe7c84e4b6b8b46c57d59679caf207.' | |
| + git reset --soft -q efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + local repo=kube-aggregator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'efa32eb Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-kube-aggregator-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-kube-aggregator-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-kube-aggregator-release-1.11.sh --dependencies apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' efa32eb095fe7c84e4b6b8b46c57d59679caf207 '!=' efa32eb095fe7c84e4b6b8b46c57d59679caf207 ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 08:11 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 08:11 UTC]: /publish_scripts/construct.sh kube-aggregator release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/kube-aggregator kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=kube-aggregator | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/kube-aggregator | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q efa32eb095fe7c84e4b6b8b46c57d59679caf207 | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/kube-aggregator release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 '' k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 12 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 03e80ae2f92f19fc6c880c3b2553a702e26e2f68. | |
| + echo 'Starting at existing release-1.12 commit 03e80ae2f92f19fc6c880c3b2553a702e26e2f68.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B release-1.12 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_base_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| + git branch -f filtered-branch-base a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/kube-aggregator. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/kube-aggregator.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/kube-aggregator 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/kube-aggregator | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/kube-aggregator -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=d52eeae372177666a484f305475f98f90edfee90 | |
| ++ git log --first-parent --format=%H --reverse d52eeae372177666a484f305475f98f90edfee90..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 '!=' 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 '' k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/kube-aggregator/") or . == "k8s.io/kube-aggregator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream-branch --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_last_kube_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-api-release-1.12 | |
| + '[' -z 8b2bf3fd233a3ac3873005b3b70ecce09065fddc ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc' | |
| Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| + git checkout -q 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-client-go-release-9.0 | |
| + '[' -z 173ad5fde8e4ee8f92763f78c6ba37322f2125ab ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab' | |
| Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| + git checkout -q 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=apiserver | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apiserver-release-1.12 | |
| + '[' -z 3f9daea3953cd4cde09c36c8c509ae8189bd6473 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473' | |
| Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| + git checkout -q 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + echo 'Godeps.json hasn'\''t changed!' | |
| + ensure-clean-working-dir | |
| Godeps.json hasn't changed! | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| Remove redundant godep commits on-top of 03e80ae2f92f19fc6c880c3b2553a702e26e2f68. | |
| + echo 'Remove redundant godep commits on-top of 03e80ae2f92f19fc6c880c3b2553a702e26e2f68.' | |
| + git reset --soft -q 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/kube-aggregator | |
| + local repo=kube-aggregator | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '89cbaaa Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-kube-aggregator-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=03e80ae2f92f19fc6c880c3b2553a702e26e2f68 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-kube-aggregator-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-kube-aggregator-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-kube-aggregator-release-1.12.sh --dependencies apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api, client-go, apiserver. | |
| Bumping k8s.io/api in Godeps.json from "f73b6294046bc80005286315ef7becd02e52bc49" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/apimachinery in Godeps.json from "a00743c2fc9ef4b057da2ec96b056f7fe953ec0d" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Bumping k8s.io/apiserver in Godeps.json from "94b3f924e23bafc723c8f891f7ec287d897dede9" to kubernetes-1.12.0-rc.2: "d9d60f3d1def56591b8695b83c2c4f2f649f7c42". | |
| Bumping k8s.io/client-go in Godeps.json from "65879682f7e19558a98b988c448d3ee792d0872d" to kubernetes-1.12.0-rc.2: "8ad43087cf1443662581b6c92a9f66208cc3556a". | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging 30ec084026f89125f877efe9be900ea63c748463 as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 '!=' 03e80ae2f92f19fc6c880c3b2553a702e26e2f68 ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was 30ec084... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 08:15 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 08:15 UTC]: Successfully ensured /go-workspace/src/k8s.io/sample-apiserver exists | |
| [24 Sep 18 08:15 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 08:15 UTC]: /publish_scripts/construct.sh sample-apiserver master master apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-apiserver | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-apiserver master master apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 13 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit 1110eaa81bb381332df7842b5e6fc21c3bc174e5. | |
| + echo 'Starting at existing master commit 1110eaa81bb381332df7842b5e6fc21c3bc174e5.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream/master --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_base_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| + git branch -f filtered-branch-base 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/sample-apiserver. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/sample-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Running git filter-branch ... | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=3f3e84edeb1dbe5c6b17441e3bb77206d269027a | |
| ++ git log --first-parent --format=%H --reverse 3f3e84edeb1dbe5c6b17441e3bb77206d269027a..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 1110eaa81bb381332df7842b5e6fc21c3bc174e5 '!=' 1110eaa81bb381332df7842b5e6fc21c3bc174e5 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-apiserver/") or . == "k8s.io/sample-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream-branch --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_last_kube_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-api-master | |
| + '[' -z 49f236fe119e127d67dec93a9d41ae1c5ed5079e ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + echo 'Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e' | |
| + git checkout -q 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-client-go-master | |
| + '[' -z 37c3c02ec96533daec0dbda1f39a6b1d68505c79 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + echo 'Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79' | |
| + git checkout -q 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apiserver-master | |
| + '[' -z 3bfd32753e74188b22f853117029bfc4360272c7 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7' | |
| Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + git checkout -q 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-code-generator-master | |
| + '[' -z aae79feb89bdded3679da91fd8c19b6dfcbdb79a ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a' | |
| Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + git checkout -q aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| Remove redundant godep commits on-top of 1110eaa81bb381332df7842b5e6fc21c3bc174e5. | |
| + echo 'Remove redundant godep commits on-top of 1110eaa81bb381332df7842b5e6fc21c3bc174e5.' | |
| + git reset --soft -q 1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + local repo=sample-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '1110eaa Merge pull request #68442 from CaoShuFeng/json-patch' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-apiserver-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-apiserver-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| ++ echo kubernetes | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-sample-apiserver-master.sh --dependencies apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' 1110eaa81bb381332df7842b5e6fc21c3bc174e5 '!=' 1110eaa81bb381332df7842b5e6fc21c3bc174e5 ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 08:18 UTC]: Successfully constructed master | |
| [24 Sep 18 08:18 UTC]: /publish_scripts/construct.sh sample-apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-apiserver | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 1110eaa81bb381332df7842b5e6fc21c3bc174e5 | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 10 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit d7fe731442f847eedccc59ee45f3db58b42fac5d. | |
| + echo 'Starting at existing release-1.9 commit d7fe731442f847eedccc59ee45f3db58b42fac5d.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B release-1.9 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream/release-1.9 | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream/release-1.9' --first-parent | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_base_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| + git branch -f filtered-branch-base f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/sample-apiserver. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/sample-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=7147e846557bd6b209f04303a32da1b16c08a001 | |
| ++ git log --first-parent --format=%H --reverse 7147e846557bd6b209f04303a32da1b16c08a001..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| Checking out branch release-1.9. | |
| + git checkout -q release-1.9 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' d7fe731442f847eedccc59ee45f3db58b42fac5d '!=' d7fe731442f847eedccc59ee45f3db58b42fac5d ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-apiserver/") or . == "k8s.io/sample-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream-branch' --first-parent | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream-branch --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_last_kube_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-6.0 | |
| + echo 'Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-client-go-release-6.0 | |
| + '[' -z e2680bfa771859c129bc5c8413fdb565af2b3dcd ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd' | |
| Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + git checkout -q e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-apiserver-release-1.9 | |
| + '[' -z 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a' | |
| Checking out k8s.io/apiserver to 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a | |
| + git checkout -q 0c27ac7eec3e47fa7637c9dba4ecf70494bbc28a | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-code-generator-release-1.9 | |
| + '[' -z 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196' | |
| Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + git checkout -q 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| Remove redundant godep commits on-top of d7fe731442f847eedccc59ee45f3db58b42fac5d. | |
| + echo 'Remove redundant godep commits on-top of d7fe731442f847eedccc59ee45f3db58b42fac5d.' | |
| + git reset --soft -q d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + local repo=sample-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'd7fe731 Merge pull request #65298 from nikhita/cherrypick-jsoniter-bump-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-apiserver-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-apiserver-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-sample-apiserver-release-1.9.sh --dependencies apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' d7fe731442f847eedccc59ee45f3db58b42fac5d '!=' d7fe731442f847eedccc59ee45f3db58b42fac5d ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 08:20 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 08:20 UTC]: /publish_scripts/construct.sh sample-apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-apiserver | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q d7fe731442f847eedccc59ee45f3db58b42fac5d | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 12 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit a123764dbbb39e5ade76a18f8d8418ad48c27672. | |
| + echo 'Starting at existing release-1.10 commit a123764dbbb39e5ade76a18f8d8418ad48c27672.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream/release-1.10 | |
| ++ tail -1 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream/release-1.10' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local k_base_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| + git branch -f filtered-branch-base 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/sample-apiserver. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/sample-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Running git filter-branch ... | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=a9d3b8a9dd1a2085477567fe4827aca4cf689a67 | |
| ++ git log --first-parent --format=%H --reverse a9d3b8a9dd1a2085477567fe4827aca4cf689a67..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' a123764dbbb39e5ade76a18f8d8418ad48c27672 '!=' a123764dbbb39e5ade76a18f8d8418ad48c27672 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-apiserver/") or . == "k8s.io/sample-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream-branch' --first-parent | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream-branch --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + local k_last_kube_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-apimachinery-release-1.10 | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-api-release-1.10 | |
| + '[' -z 8b7507fac302640dd5f1efbf9643199952cc58db ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db' | |
| Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + git checkout -q 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + local branch=release-7.0 | |
| + echo 'Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-client-go-release-7.0 | |
| Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| + '[' -z a312bfe35c401f70e5ea0add48b50da283031dc3 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3' | |
| + git checkout -q a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-apiserver-release-1.10 | |
| Checking out k8s.io/apiserver to d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 | |
| + '[' -z d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3' | |
| + git checkout -q d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 | |
| Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-code-generator-release-1.10 | |
| Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + '[' -z 9de8e796a74d16d2a285165727d04c185ebca6dc ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc' | |
| + git checkout -q 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| Running godep save. | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| Remove redundant godep commits on-top of a123764dbbb39e5ade76a18f8d8418ad48c27672. | |
| + echo 'Remove redundant godep commits on-top of a123764dbbb39e5ade76a18f8d8418ad48c27672.' | |
| + git reset --soft -q a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + local repo=sample-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'a123764 Merge pull request #65157 from caesarxuchao/cherrypick-65034-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-apiserver-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-apiserver-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-sample-apiserver-release-1.10.sh --dependencies apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' a123764dbbb39e5ade76a18f8d8418ad48c27672 '!=' a123764dbbb39e5ade76a18f8d8418ad48c27672 ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 08:22 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 08:22 UTC]: /publish_scripts/construct.sh sample-apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| Running garbage collection. | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-apiserver | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q a123764dbbb39e5ade76a18f8d8418ad48c27672 | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 13 = 0 ']' | |
| ++ git rev-parse HEAD | |
| + echo 'Starting at existing release-1.11 commit 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb.' | |
| + git branch -D filtered-branch | |
| Starting at existing release-1.11 commit 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb. | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| ++ git-find-merge 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list '5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local k_base_merge=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| + git branch -f filtered-branch-base 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/sample-apiserver. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/sample-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=2fd6254f98518fe31b35de1af0c834c387af4e0f | |
| ++ git log --first-parent --format=%H --reverse 2fd6254f98518fe31b35de1af0c834c387af4e0f..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| Fixing up godeps after a complete sync | |
| + local dst_merge_point_commit=76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb '!=' 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-apiserver/") or . == "k8s.io/sample-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| ++ git-find-merge 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06^1..upstream-branch' --first-parent | |
| +++ git rev-list 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06..upstream-branch --ancestry-path | |
| +++ git rev-parse 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local k_last_kube_merge=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z 103fd098999dc9c0c88536f5c9ad2e5da39373ae ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 103fd098999dc9c0c88536f5c9ad2e5da39373ae | |
| + echo 'Checking out k8s.io/apimachinery to 103fd098999dc9c0c88536f5c9ad2e5da39373ae' | |
| + git checkout -q 103fd098999dc9c0c88536f5c9ad2e5da39373ae | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| + read k_commit dep_commit | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-api-release-1.11 | |
| + '[' -z 9e325467be0d83799fa9d630047839982ced21d0 ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 9e325467be0d83799fa9d630047839982ced21d0 | |
| + echo 'Checking out k8s.io/api to 9e325467be0d83799fa9d630047839982ced21d0' | |
| + git checkout -q 9e325467be0d83799fa9d630047839982ced21d0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-8.0 | |
| + echo 'Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-client-go-release-8.0 | |
| + '[' -z e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a | |
| + echo 'Checking out k8s.io/client-go to e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a' | |
| + git checkout -q e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-apiserver-release-1.11 | |
| + '[' -z 13d596dfbbe4adc1d805221deac7ea011f54847c ']' | |
| + pushd ../apiserver | |
| Checking out k8s.io/apiserver to 13d596dfbbe4adc1d805221deac7ea011f54847c | |
| + echo 'Checking out k8s.io/apiserver to 13d596dfbbe4adc1d805221deac7ea011f54847c' | |
| + git checkout -q 13d596dfbbe4adc1d805221deac7ea011f54847c | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-code-generator-release-1.11 | |
| + '[' -z 6702109cc68eb6fe6350b83e14407c8d7309fd1a ']' | |
| + pushd ../code-generator | |
| Checking out k8s.io/code-generator to 6702109cc68eb6fe6350b83e14407c8d7309fd1a | |
| + echo 'Checking out k8s.io/code-generator to 6702109cc68eb6fe6350b83e14407c8d7309fd1a' | |
| + git checkout -q 6702109cc68eb6fe6350b83e14407c8d7309fd1a | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| Running godep save. | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| Remove redundant godep commits on-top of 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb. | |
| + echo 'Remove redundant godep commits on-top of 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb.' | |
| + git reset --soft -q 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + local repo=sample-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'f46cde7 Merge pull request #65283 from liggitt/automated-cherry-pick-of-#65256-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-apiserver-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-apiserver-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-sample-apiserver-release-1.11.sh --dependencies apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb '!=' 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 08:25 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 08:25 UTC]: /publish_scripts/construct.sh sample-apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-apiserver | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| Cleaning up checkout. | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 76b4df4e75752135c6a2bd0e1d8e8548e5c5a5cb | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 7212dea24009b1fca5374cbe34a39aaeb111593a | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 13 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 7212dea24009b1fca5374cbe34a39aaeb111593a. | |
| + echo 'Starting at existing release-1.12 commit 7212dea24009b1fca5374cbe34a39aaeb111593a.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_base_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| + git branch -f filtered-branch-base a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/sample-apiserver. | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/sample-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| Running git filter-branch ... | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=3f3e84edeb1dbe5c6b17441e3bb77206d269027a | |
| ++ git log --first-parent --format=%H --reverse 3f3e84edeb1dbe5c6b17441e3bb77206d269027a..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| Fixing up godeps after a complete sync | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 7212dea24009b1fca5374cbe34a39aaeb111593a '!=' 7212dea24009b1fca5374cbe34a39aaeb111593a ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-apiserver/") or . == "k8s.io/sample-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| + local k_last_kube_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream-branch | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream-branch' --first-parent | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream-branch --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + local k_last_kube_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-api-release-1.12 | |
| Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| + '[' -z 8b2bf3fd233a3ac3873005b3b70ecce09065fddc ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc' | |
| + git checkout -q 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-client-go-release-9.0 | |
| Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| + '[' -z 173ad5fde8e4ee8f92763f78c6ba37322f2125ab ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab' | |
| + git checkout -q 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apiserver-release-1.12 | |
| + '[' -z 3f9daea3953cd4cde09c36c8c509ae8189bd6473 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473' | |
| + git checkout -q 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-code-generator-release-1.12 | |
| Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + '[' -z 3dcf91f64f638563e5106f21f50c31fa361c918d ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d' | |
| + git checkout -q 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 7212dea24009b1fca5374cbe34a39aaeb111593a | |
| Remove redundant godep commits on-top of 7212dea24009b1fca5374cbe34a39aaeb111593a. | |
| + echo 'Remove redundant godep commits on-top of 7212dea24009b1fca5374cbe34a39aaeb111593a.' | |
| + git reset --soft -q 7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-apiserver | |
| + local repo=sample-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '364891d Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-apiserver-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=7212dea24009b1fca5374cbe34a39aaeb111593a | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-apiserver-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-apiserver-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-sample-apiserver-release-1.12.sh --dependencies apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api, client-go, apiserver, code-generator. | |
| Bumping k8s.io/api in Godeps.json from "f73b6294046bc80005286315ef7becd02e52bc49" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/apimachinery in Godeps.json from "a00743c2fc9ef4b057da2ec96b056f7fe953ec0d" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Bumping k8s.io/apiserver in Godeps.json from "94b3f924e23bafc723c8f891f7ec287d897dede9" to kubernetes-1.12.0-rc.2: "d9d60f3d1def56591b8695b83c2c4f2f649f7c42". | |
| Bumping k8s.io/client-go in Godeps.json from "65879682f7e19558a98b988c448d3ee792d0872d" to kubernetes-1.12.0-rc.2: "8ad43087cf1443662581b6c92a9f66208cc3556a". | |
| Warning: dependency k8s.io/code-generator not found in Godeps.json. | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging 1ed9c9472ce4cb38643b77f9a7ecadb567efb27a as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 7212dea24009b1fca5374cbe34a39aaeb111593a '!=' 7212dea24009b1fca5374cbe34a39aaeb111593a ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was 1ed9c94... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 08:28 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 08:28 UTC]: Successfully ensured /go-workspace/src/k8s.io/sample-controller exists | |
| [24 Sep 18 08:28 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 08:28 UTC]: /publish_scripts/construct.sh sample-controller master master apimachinery:master,api:master,client-go:master,code-generator:master k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-controller kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-controller | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master,code-generator:master | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-controller | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Running garbage collection. | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-controller master master apimachinery:master,api:master,client-go:master,code-generator:master k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0. | |
| + echo 'Starting at existing master commit af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B master | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| ++ true | |
| + local k_base_commit=7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + '[' -z 7b6647a418c660f2c87f183f706b297f1cb573ca ']' | |
| ++ git-find-merge 7b6647a418c660f2c87f183f706b297f1cb573ca upstream/master | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '7b6647a418c660f2c87f183f706b297f1cb573ca^1..upstream/master' --first-parent | |
| +++ git rev-list 7b6647a418c660f2c87f183f706b297f1cb573ca..upstream/master --ancestry-path | |
| +++ git rev-parse 7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + local k_base_merge=7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + '[' -z 7b6647a418c660f2c87f183f706b297f1cb573ca ']' | |
| + git branch -f filtered-branch-base 7b6647a418c660f2c87f183f706b297f1cb573ca | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/sample-controller. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/sample-controller.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-controller 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-controller -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=4567c49908c9c15f56824379ade81e345def5522 | |
| ++ git log --first-parent --format=%H --reverse 4567c49908c9c15f56824379ade81e345def5522..HEAD | |
| Checking out branch master. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| Fixing up godeps after a complete sync | |
| + local dst_merge_point_commit=af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 '!=' af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:master,api:master,client-go:master,code-generator:master k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master,client-go:master,code-generator:master k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:master,api:master,client-go:master,code-generator:master | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-controller/") or . == "k8s.io/sample-controller") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| Running godep restore. | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master,code-generator:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B HEAD | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + '[' -z 7b6647a418c660f2c87f183f706b297f1cb573ca ']' | |
| ++ git-find-merge 7b6647a418c660f2c87f183f706b297f1cb573ca upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '7b6647a418c660f2c87f183f706b297f1cb573ca^1..upstream-branch' --first-parent | |
| +++ git rev-list 7b6647a418c660f2c87f183f706b297f1cb573ca..upstream-branch --ancestry-path | |
| +++ git rev-parse 7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + local k_last_kube_merge=7b6647a418c660f2c87f183f706b297f1cb573ca | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca.' | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 7b6647a418c660f2c87f183f706b297f1cb573ca ../kube-commits-apimachinery-master | |
| Checking out k8s.io/apimachinery to 9dc1de72c0f3996657ffc88895f89f3844d8cf01 | |
| + '[' -z 9dc1de72c0f3996657ffc88895f89f3844d8cf01 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 9dc1de72c0f3996657ffc88895f89f3844d8cf01' | |
| + git checkout -q 9dc1de72c0f3996657ffc88895f89f3844d8cf01 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca. | |
| ++ look -b 7b6647a418c660f2c87f183f706b297f1cb573ca ../kube-commits-api-master | |
| + '[' -z fcb01e9febf3e72ae9b6eff41f2d02ffdea4dda1 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to fcb01e9febf3e72ae9b6eff41f2d02ffdea4dda1' | |
| Checking out k8s.io/api to fcb01e9febf3e72ae9b6eff41f2d02ffdea4dda1 | |
| + git checkout -q fcb01e9febf3e72ae9b6eff41f2d02ffdea4dda1 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca. | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 7b6647a418c660f2c87f183f706b297f1cb573ca ../kube-commits-client-go-master | |
| + '[' -z f06dbfd7354359a944eca1b0a555067933f10c3e ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to f06dbfd7354359a944eca1b0a555067933f10c3e | |
| + echo 'Checking out k8s.io/client-go to f06dbfd7354359a944eca1b0a555067933f10c3e' | |
| + git checkout -q f06dbfd7354359a944eca1b0a555067933f10c3e | |
| Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca. | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=code-generator | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 7b6647a418c660f2c87f183f706b297f1cb573ca.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 7b6647a418c660f2c87f183f706b297f1cb573ca ../kube-commits-code-generator-master | |
| + '[' -z aae79feb89bdded3679da91fd8c19b6dfcbdb79a ']' | |
| + pushd ../code-generator | |
| Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + echo 'Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a' | |
| + git checkout -q aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| Running godep save. | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| Remove redundant godep commits on-top of af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0. | |
| + echo 'Remove redundant godep commits on-top of af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0.' | |
| + git reset --soft -q af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + local repo=sample-controller | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-master | |
| + '[' -n 'af8f21f Merge pull request #67359 from mikedanese/reloadtoken' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-master' | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-controller-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-controller-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-sample-controller-master.sh --dependencies apimachinery:master,api:master,client-go:master,code-generator:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.9.0-alpha.1" seems to be relevant. | |
| ++ git rev-parse master | |
| + '[' af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 '!=' af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 08:30 UTC]: Successfully constructed master | |
| [24 Sep 18 08:30 UTC]: /publish_scripts/construct.sh sample-controller release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-controller kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-controller | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-controller | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q af8f21f6ee2c2cd4b27568a0bb4b81a04a90c8e0 | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| + echo 'Fetching upstream changes.' | |
| Fetching upstream changes. | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-controller release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 10 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit e0611f3d05b5ae6af45574f6c102a982edb91565. | |
| + echo 'Starting at existing release-1.9 commit e0611f3d05b5ae6af45574f6c102a982edb91565.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.9 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_base_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream/release-1.9 | |
| ++ tail -1 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream/release-1.9' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_base_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| + git branch -f filtered-branch-base f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/sample-controller.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-controller 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/sample-controller. | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| Running git filter-branch ... | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-controller -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=9a514ee81882f83b80f7133a674e6a0489821a29 | |
| ++ git log --first-parent --format=%H --reverse 9a514ee81882f83b80f7133a674e6a0489821a29..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' e0611f3d05b5ae6af45574f6c102a982edb91565 '!=' e0611f3d05b5ae6af45574f6c102a982edb91565 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-controller/") or . == "k8s.io/sample-controller") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + '[' -z f4cf484c2cb6056e28fb9759a3c913be3eed990a ']' | |
| ++ git-find-merge f4cf484c2cb6056e28fb9759a3c913be3eed990a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f4cf484c2cb6056e28fb9759a3c913be3eed990a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f4cf484c2cb6056e28fb9759a3c913be3eed990a..upstream-branch --ancestry-path | |
| +++ git rev-parse f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local k_last_kube_merge=f4cf484c2cb6056e28fb9759a3c913be3eed990a | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-6.0 | |
| + echo 'Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-client-go-release-6.0 | |
| + '[' -z e2680bfa771859c129bc5c8413fdb565af2b3dcd ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd' | |
| + git checkout -q e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=code-generator | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f4cf484c2cb6056e28fb9759a3c913be3eed990a. | |
| + read k_commit dep_commit | |
| ++ look -b f4cf484c2cb6056e28fb9759a3c913be3eed990a ../kube-commits-code-generator-release-1.9 | |
| + '[' -z 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196' | |
| + git checkout -q 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + indent-godeps | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + echo 'Remove redundant godep commits on-top of e0611f3d05b5ae6af45574f6c102a982edb91565.' | |
| + git reset --soft -q e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| Remove redundant godep commits on-top of e0611f3d05b5ae6af45574f6c102a982edb91565. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + local repo=sample-controller | |
| ++ head -n 1 | |
| ++ git log --oneline --first-parent --merges | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.9 | |
| + '[' -n 'e0611f3 Merge pull request #65298 from nikhita/cherrypick-jsoniter-bump-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.9' | |
| ++ sed 's/^./\L\u&/' | |
| ++ echo kubernetes | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-controller-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-controller-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-sample-controller-release-1.9.sh --dependencies apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,code-generator:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.9.0-alpha.1" seems to be relevant. | |
| ++ git rev-parse release-1.9 | |
| + '[' e0611f3d05b5ae6af45574f6c102a982edb91565 '!=' e0611f3d05b5ae6af45574f6c102a982edb91565 ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 08:32 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 08:32 UTC]: /publish_scripts/construct.sh sample-controller release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-controller kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-controller | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-controller | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q e0611f3d05b5ae6af45574f6c102a982edb91565 | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + git checkout -q release-1.10 | |
| + echo 'Fetching upstream changes.' | |
| Fetching upstream changes. | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-controller release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| e52f649fe5873ecdb98361194838808fb35fcb6f | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 12 = 0 ']' | |
| ++ git rev-parse HEAD | |
| + echo 'Starting at existing release-1.10 commit e52f649fe5873ecdb98361194838808fb35fcb6f.' | |
| + git branch -D filtered-branch | |
| Starting at existing release-1.10 commit e52f649fe5873ecdb98361194838808fb35fcb6f. | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream/release-1.10 | |
| ++ tail -1 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream/release-1.10' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local k_base_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| + git branch -f filtered-branch-base 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/sample-controller.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-controller 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/sample-controller. | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-controller -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=4f5f22f0fa710858d3b6cd29d17f44d955539a3e | |
| ++ git log --first-parent --format=%H --reverse 4f5f22f0fa710858d3b6cd29d17f44d955539a3e..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| Checking out branch release-1.10. | |
| + git checkout -q release-1.10 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' e52f649fe5873ecdb98361194838808fb35fcb6f '!=' e52f649fe5873ecdb98361194838808fb35fcb6f ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-controller/") or . == "k8s.io/sample-controller") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| Running godep restore. | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B HEAD | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ head -n 1 | |
| + local k_last_kube_commit=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + '[' -z 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ']' | |
| ++ git-find-merge 32ac1c9073b132b8ba18aa830f46b77dcceb0723 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '32ac1c9073b132b8ba18aa830f46b77dcceb0723^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 32ac1c9073b132b8ba18aa830f46b77dcceb0723..upstream-branch --ancestry-path | |
| +++ git rev-parse 32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + local k_last_kube_merge=32ac1c9073b132b8ba18aa830f46b77dcceb0723 | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-apimachinery-release-1.10 | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-api-release-1.10 | |
| Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + '[' -z 8b7507fac302640dd5f1efbf9643199952cc58db ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db' | |
| + git checkout -q 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| + local dep=client-go | |
| + local branch=release-7.0 | |
| + echo 'Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-client-go-release-7.0 | |
| Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| + '[' -z a312bfe35c401f70e5ea0add48b50da283031dc3 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3' | |
| + git checkout -q a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=code-generator | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 32ac1c9073b132b8ba18aa830f46b77dcceb0723. | |
| ++ look -b 32ac1c9073b132b8ba18aa830f46b77dcceb0723 ../kube-commits-code-generator-release-1.10 | |
| + '[' -z 9de8e796a74d16d2a285165727d04c185ebca6dc ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc' | |
| Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + git checkout -q 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + echo 'Remove redundant godep commits on-top of e52f649fe5873ecdb98361194838808fb35fcb6f.' | |
| + git reset --soft -q e52f649fe5873ecdb98361194838808fb35fcb6f | |
| Remove redundant godep commits on-top of e52f649fe5873ecdb98361194838808fb35fcb6f. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + local repo=sample-controller | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'e52f649 Merge pull request #65157 from caesarxuchao/cherrypick-65034-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-controller-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-controller-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-sample-controller-release-1.10.sh --dependencies apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,code-generator:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.9.0-alpha.1" seems to be relevant. | |
| ++ git rev-parse release-1.10 | |
| + '[' e52f649fe5873ecdb98361194838808fb35fcb6f '!=' e52f649fe5873ecdb98361194838808fb35fcb6f ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 08:34 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 08:34 UTC]: /publish_scripts/construct.sh sample-controller release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-controller kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-controller | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-controller | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q e52f649fe5873ecdb98361194838808fb35fcb6f | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + git checkout -q release-1.11 | |
| + echo 'Fetching upstream changes.' | |
| Fetching upstream changes. | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-controller release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| + echo 'Starting at existing release-1.11 commit 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d.' | |
| + git branch -D filtered-branch | |
| Starting at existing release-1.11 commit 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d. | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| ++ git-find-merge 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 upstream/release-1.11 | |
| +++ git rev-list '5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06..upstream/release-1.11 --ancestry-path | |
| ++ tail -1 | |
| +++ git rev-parse 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local k_base_merge=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| + git branch -f filtered-branch-base 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/sample-controller. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/sample-controller.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-controller 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-controller -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=c78884fd79bba2e7957d5d3bc23c00d2d19bad8d | |
| ++ git log --first-parent --format=%H --reverse c78884fd79bba2e7957d5d3bc23c00d2d19bad8d..HEAD | |
| Checking out branch release-1.11. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| Fixing up godeps after a complete sync | |
| + local dst_merge_point_commit=135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d '!=' 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + indent-godeps | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-controller/") or . == "k8s.io/sample-controller") | not))' Godeps/Godeps.json | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + '[' -z 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ']' | |
| ++ git-find-merge 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06..upstream-branch --ancestry-path | |
| +++ git rev-parse 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local k_last_kube_merge=5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z 103fd098999dc9c0c88536f5c9ad2e5da39373ae ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 103fd098999dc9c0c88536f5c9ad2e5da39373ae | |
| + echo 'Checking out k8s.io/apimachinery to 103fd098999dc9c0c88536f5c9ad2e5da39373ae' | |
| + git checkout -q 103fd098999dc9c0c88536f5c9ad2e5da39373ae | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-api-release-1.11 | |
| + '[' -z 9e325467be0d83799fa9d630047839982ced21d0 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 9e325467be0d83799fa9d630047839982ced21d0' | |
| + git checkout -q 9e325467be0d83799fa9d630047839982ced21d0 | |
| Checking out k8s.io/api to 9e325467be0d83799fa9d630047839982ced21d0 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-8.0 | |
| + echo 'Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-client-go-release-8.0 | |
| + '[' -z e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a' | |
| Checking out k8s.io/client-go to e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a | |
| + git checkout -q e5bc2a7bbbdf78f2a331b8c23838d1bbb1c6b40a | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=code-generator | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06. | |
| ++ look -b 5f5d6aa92b27bc300c631fd3fe26edc0f55fbb06 ../kube-commits-code-generator-release-1.11 | |
| + '[' -z 6702109cc68eb6fe6350b83e14407c8d7309fd1a ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 6702109cc68eb6fe6350b83e14407c8d7309fd1a' | |
| + git checkout -q 6702109cc68eb6fe6350b83e14407c8d7309fd1a | |
| Checking out k8s.io/code-generator to 6702109cc68eb6fe6350b83e14407c8d7309fd1a | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + git commit -q -m 'sync: update required packages' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + echo 'Remove redundant godep commits on-top of 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d.' | |
| + git reset --soft -q 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| Remove redundant godep commits on-top of 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + local repo=sample-controller | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '57c108f Merge pull request #65283 from liggitt/automated-cherry-pick-of-#65256-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-controller-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-controller-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-sample-controller-release-1.11.sh --dependencies apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,code-generator:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.9.0-alpha.1" seems to be relevant. | |
| ++ git rev-parse release-1.11 | |
| + '[' 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d '!=' 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 08:36 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 08:36 UTC]: /publish_scripts/construct.sh sample-controller release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/sample-controller kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=sample-controller | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/sample-controller | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 135c4c60c00b6802dfcc8e66e9079fc73bbafb9d | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/sample-controller release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 15 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731. | |
| + echo 'Starting at existing release-1.12 commit 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + '[' -z 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ']' | |
| ++ git-find-merge 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list '4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + local k_base_merge=4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + '[' -z 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ']' | |
| + git branch -f filtered-branch-base 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/sample-controller. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/sample-controller.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/sample-controller 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/sample-controller | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/sample-controller -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=4567c49908c9c15f56824379ade81e345def5522 | |
| ++ git log --first-parent --format=%H --reverse 4567c49908c9c15f56824379ade81e345def5522..HEAD | |
| Checking out branch release-1.12. | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 '!=' 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/sample-controller/") or . == "k8s.io/sample-controller") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + '[' -z 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ']' | |
| ++ git-find-merge 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list '4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c^1..upstream-branch' --first-parent | |
| +++ git rev-list 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c..upstream-branch --ancestry-path | |
| +++ git rev-parse 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + local k_last_kube_merge=4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c | |
| + local dep_count=4 | |
| + (( i=0 )) | |
| + (( i<4 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c.' | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 0cf8750f4d318a2ea6fb147b9e388b0864947d50 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 0cf8750f4d318a2ea6fb147b9e388b0864947d50 | |
| + echo 'Checking out k8s.io/apimachinery to 0cf8750f4d318a2ea6fb147b9e388b0864947d50' | |
| + git checkout -q 0cf8750f4d318a2ea6fb147b9e388b0864947d50 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c. | |
| ++ look -b 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ../kube-commits-api-release-1.12 | |
| + '[' -z f73b6294046bc80005286315ef7becd02e52bc49 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to f73b6294046bc80005286315ef7becd02e52bc49' | |
| + git checkout -q f73b6294046bc80005286315ef7becd02e52bc49 | |
| Checking out k8s.io/api to f73b6294046bc80005286315ef7becd02e52bc49 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c. | |
| + read k_commit dep_commit | |
| ++ look -b 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ../kube-commits-client-go-release-9.0 | |
| + '[' -z 1bb88b0329ce2eef3096a3f48afb46965f3cf605 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 1bb88b0329ce2eef3096a3f48afb46965f3cf605' | |
| Checking out k8s.io/client-go to 1bb88b0329ce2eef3096a3f48afb46965f3cf605 | |
| + git checkout -q 1bb88b0329ce2eef3096a3f48afb46965f3cf605 | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + local dep=code-generator | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c. | |
| ++ look -b 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c ../kube-commits-code-generator-release-1.12 | |
| + '[' -z 3dcf91f64f638563e5106f21f50c31fa361c918d ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d' | |
| + git checkout -q 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + popd | |
| + (( i++ )) | |
| + (( i<4 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| Remove redundant godep commits on-top of 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731. | |
| + echo 'Remove redundant godep commits on-top of 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731.' | |
| + git reset --soft -q 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/sample-controller | |
| + local repo=sample-controller | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '927b78e Merge remote-tracking branch '\''origin/master'\'' into release-1.12. Deleting CHANGELOG-1.11.md' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-sample-controller-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-sample-controller-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-sample-controller-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-sample-controller-release-1.12.sh --dependencies apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,code-generator:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.9.0-alpha.0" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api, client-go, code-generator. | |
| Bumping k8s.io/api in Godeps.json from "a85547435a3c7619e9e6e3a5fcada7170aeca4bb" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/apimachinery in Godeps.json from "fcd752c8d6fb08bf1120ff021689610bb95ca523" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Bumping k8s.io/client-go in Godeps.json from "7dc224ff75b12694e2b17ae5ed71e986253bc7b5" to kubernetes-1.12.0-rc.2: "8ad43087cf1443662581b6c92a9f66208cc3556a". | |
| Warning: dependency k8s.io/code-generator not found in Godeps.json. | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging 1de43855480b24d06ef1af820c902882d4c6846a as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 '!=' 927b78e23d9fcfe0d1c0cd8c38e6a714d7cd3731 ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was 1de4385... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 08:38 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 08:38 UTC]: Successfully ensured /go-workspace/src/k8s.io/apiextensions-apiserver exists | |
| [24 Sep 18 08:38 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 08:38 UTC]: /publish_scripts/construct.sh apiextensions-apiserver master master apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiextensions-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiextensions-apiserver | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiextensions-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| + echo 'Fetching upstream changes.' | |
| Fetching upstream changes. | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiextensions-apiserver master master apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 14 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing master commit d65f4428c04f2d28f924a47d1d2177d0cbf45a16. | |
| + echo 'Starting at existing master commit d65f4428c04f2d28f924a47d1d2177d0cbf45a16.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream/master --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_base_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| + git branch -f filtered-branch-base 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/apiextensions-apiserver. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/apiextensions-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiextensions-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| Running git filter-branch ... | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiextensions-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=816aa754a5182fc1b8a7c76e8a7004b2507a6be9 | |
| ++ git log --first-parent --format=%H --reverse 816aa754a5182fc1b8a7c76e8a7004b2507a6be9..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| Checking out branch master. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' d65f4428c04f2d28f924a47d1d2177d0cbf45a16 '!=' d65f4428c04f2d28f924a47d1d2177d0cbf45a16 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiextensions-apiserver/") or . == "k8s.io/apiextensions-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + '[' -z 9cf822183f9522028fbb23561b8d51496b8a98fe ']' | |
| ++ git-find-merge 9cf822183f9522028fbb23561b8d51496b8a98fe upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '9cf822183f9522028fbb23561b8d51496b8a98fe^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 9cf822183f9522028fbb23561b8d51496b8a98fe..upstream-branch --ancestry-path | |
| +++ git rev-parse 9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local k_last_kube_merge=9cf822183f9522028fbb23561b8d51496b8a98fe | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-api-master | |
| + '[' -z 49f236fe119e127d67dec93a9d41ae1c5ed5079e ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + echo 'Checking out k8s.io/api to 49f236fe119e127d67dec93a9d41ae1c5ed5079e' | |
| + git checkout -q 49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-client-go-master | |
| + '[' -z 37c3c02ec96533daec0dbda1f39a6b1d68505c79 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79' | |
| Checking out k8s.io/client-go to 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + git checkout -q 37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-apiserver-master | |
| + '[' -z 3bfd32753e74188b22f853117029bfc4360272c7 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7' | |
| Checking out k8s.io/apiserver to 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + git checkout -q 3bfd32753e74188b22f853117029bfc4360272c7 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe.' | |
| Looking up which commit in the master branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 9cf822183f9522028fbb23561b8d51496b8a98fe. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 9cf822183f9522028fbb23561b8d51496b8a98fe ../kube-commits-code-generator-master | |
| + '[' -z aae79feb89bdded3679da91fd8c19b6dfcbdb79a ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a' | |
| Checking out k8s.io/code-generator to aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + git checkout -q aae79feb89bdded3679da91fd8c19b6dfcbdb79a | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| Remove redundant godep commits on-top of d65f4428c04f2d28f924a47d1d2177d0cbf45a16. | |
| + echo 'Remove redundant godep commits on-top of d65f4428c04f2d28f924a47d1d2177d0cbf45a16.' | |
| + git reset --soft -q d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + local repo=apiextensions-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'd65f442 Merge pull request #68442 from CaoShuFeng/json-patch' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-master' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-master | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=master | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiextensions-apiserver-master.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiextensions-apiserver-master.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch master --push-script ../push-tags-apiextensions-apiserver-master.sh --dependencies apimachinery:master,api:master,client-go:master,apiserver:master,code-generator:master -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse master | |
| + '[' d65f4428c04f2d28f924a47d1d2177d0cbf45a16 '!=' d65f4428c04f2d28f924a47d1d2177d0cbf45a16 ']' | |
| + git checkout master | |
| Already on 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| [24 Sep 18 08:41 UTC]: Successfully constructed master | |
| [24 Sep 18 08:41 UTC]: /publish_scripts/construct.sh apiextensions-apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiextensions-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiextensions-apiserver | |
| + SRC_BRANCH=release-1.9 | |
| + DST_BRANCH=release-1.9 | |
| + DEPS=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiextensions-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=0da6e045912173bef7e8bba350c3ddc95a1c90e2 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Running garbage collection. | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q d65f4428c04f2d28f924a47d1d2177d0cbf45a16 | |
| + git branch -D release-1.9 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.9 | |
| Switching to origin/release-1.9. | |
| + echo 'Switching to origin/release-1.9.' | |
| + git branch -f release-1.9 origin/release-1.9 | |
| + git checkout -q release-1.9 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.9 | |
| + UPSTREAM_HASH=824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 | |
| + '[' 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0 '!=' 0da6e045912173bef7e8bba350c3ddc95a1c90e2 ']' | |
| + echo 'Upstream branch upstream/release-1.9 moved from '\''0da6e045912173bef7e8bba350c3ddc95a1c90e2'\'' to '\''824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'\''. We have to sync.' | |
| Upstream branch upstream/release-1.9 moved from '0da6e045912173bef7e8bba350c3ddc95a1c90e2' to '824ebd5e02df8d855aeb60619d0bf8e88b8c85f0'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiextensions-apiserver release-1.9 release-1.9 apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local src_branch=release-1.9 | |
| + local dst_branch=release-1.9 | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 11 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.9 commit 7e9f478f435dad2133a8b41431f4ac67c85f7ddf. | |
| + echo 'Starting at existing release-1.9 commit 7e9f478f435dad2133a8b41431f4ac67c85f7ddf.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.9 | |
| Branch upstream-branch set up to track remote branch release-1.9 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0. | |
| + echo 'Checked out source commit 824ebd5e02df8d855aeb60619d0bf8e88b8c85f0.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.9 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ git log --format=%B release-1.9 | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + '[' -z 017bebad01efbc0521aaefcff919893ca284a6e3 ']' | |
| ++ git-find-merge 017bebad01efbc0521aaefcff919893ca284a6e3 upstream/release-1.9 | |
| ++ tail -1 | |
| +++ git rev-list '017bebad01efbc0521aaefcff919893ca284a6e3^1..upstream/release-1.9' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 017bebad01efbc0521aaefcff919893ca284a6e3..upstream/release-1.9 --ancestry-path | |
| +++ git rev-parse 017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + local k_base_merge=017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + '[' -z 017bebad01efbc0521aaefcff919893ca284a6e3 ']' | |
| + git branch -f filtered-branch-base 017bebad01efbc0521aaefcff919893ca284a6e3 | |
| Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apiextensions-apiserver. | |
| + echo 'Rewriting upstream branch release-1.9 to only include commits for staging/src/k8s.io/apiextensions-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiextensions-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| Running git filter-branch ... | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiextensions-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=1f93654dcd441d822dcf53d7f1486513c1c4bd75 | |
| ++ git log --first-parent --format=%H --reverse 1f93654dcd441d822dcf53d7f1486513c1c4bd75..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.9.' | |
| + git checkout -q release-1.9 | |
| Checking out branch release-1.9. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' 7e9f478f435dad2133a8b41431f4ac67c85f7ddf '!=' 7e9f478f435dad2133a8b41431f4ac67c85f7ddf ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiextensions-apiserver/") or . == "k8s.io/apiextensions-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + '[' -z 017bebad01efbc0521aaefcff919893ca284a6e3 ']' | |
| ++ git-find-merge 017bebad01efbc0521aaefcff919893ca284a6e3 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '017bebad01efbc0521aaefcff919893ca284a6e3^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 017bebad01efbc0521aaefcff919893ca284a6e3..upstream-branch --ancestry-path | |
| +++ git rev-parse 017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + local k_last_kube_merge=017bebad01efbc0521aaefcff919893ca284a6e3 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3.' | |
| Looking up which commit in the release-1.9 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 017bebad01efbc0521aaefcff919893ca284a6e3 ../kube-commits-apimachinery-release-1.9 | |
| + '[' -z fb40df2b502912cbe3a93aa61c2b2487f39cb42f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f' | |
| Checking out k8s.io/apimachinery to fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + git checkout -q fb40df2b502912cbe3a93aa61c2b2487f39cb42f | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.9 branch of k8s.io/api corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3. | |
| ++ look -b 017bebad01efbc0521aaefcff919893ca284a6e3 ../kube-commits-api-release-1.9 | |
| + '[' -z 9273ee02527c608cecc74969b3e489f5dba686da ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da' | |
| + git checkout -q 9273ee02527c608cecc74969b3e489f5dba686da | |
| Checking out k8s.io/api to 9273ee02527c608cecc74969b3e489f5dba686da | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-6.0 | |
| + echo 'Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-6.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3. | |
| ++ look -b 017bebad01efbc0521aaefcff919893ca284a6e3 ../kube-commits-client-go-release-6.0 | |
| + '[' -z e2680bfa771859c129bc5c8413fdb565af2b3dcd ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd' | |
| Checking out k8s.io/client-go to e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + git checkout -q e2680bfa771859c129bc5c8413fdb565af2b3dcd | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3. | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 017bebad01efbc0521aaefcff919893ca284a6e3 ../kube-commits-apiserver-release-1.9 | |
| + '[' -z e155c61c2126110d5dae107c33bbfc15031ff933 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to e155c61c2126110d5dae107c33bbfc15031ff933' | |
| Checking out k8s.io/apiserver to e155c61c2126110d5dae107c33bbfc15031ff933 | |
| + git checkout -q e155c61c2126110d5dae107c33bbfc15031ff933 | |
| Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.9 | |
| + echo 'Looking up which commit in the release-1.9 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit 017bebad01efbc0521aaefcff919893ca284a6e3.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b 017bebad01efbc0521aaefcff919893ca284a6e3 ../kube-commits-code-generator-release-1.9 | |
| Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + '[' -z 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 0ab89e584187c20cc7c1a3f30db69f3b4ab64196' | |
| + git checkout -q 0ab89e584187c20cc7c1a3f30db69f3b4ab64196 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.9 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| Remove redundant godep commits on-top of 7e9f478f435dad2133a8b41431f4ac67c85f7ddf. | |
| + echo 'Remove redundant godep commits on-top of 7e9f478f435dad2133a8b41431f4ac67c85f7ddf.' | |
| + git reset --soft -q 7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + local repo=apiextensions-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '7e9f478 Merge pull request #65170 from sttts/automated-cherry-pick-of-#65092-upstream-release-1.9' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.9' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.9 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.9 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiextensions-apiserver-release-1.9.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiextensions-apiserver-release-1.9.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.9 --push-script ../push-tags-apiextensions-apiserver-release-1.9.sh --dependencies apimachinery:release-1.9,api:release-1.9,client-go:release-6.0,apiserver:release-1.9,code-generator:release-1.9 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.9 | |
| + '[' 7e9f478f435dad2133a8b41431f4ac67c85f7ddf '!=' 7e9f478f435dad2133a8b41431f4ac67c85f7ddf ']' | |
| + git checkout release-1.9 | |
| Already on 'release-1.9' | |
| Your branch is up-to-date with 'origin/release-1.9'. | |
| [24 Sep 18 08:43 UTC]: Successfully constructed release-1.9 | |
| [24 Sep 18 08:43 UTC]: /publish_scripts/construct.sh apiextensions-apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiextensions-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiextensions-apiserver | |
| + SRC_BRANCH=release-1.10 | |
| + DST_BRANCH=release-1.10 | |
| + DEPS=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiextensions-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=557579c4c9d396c9e4aa1e46b64b9ad74a99a896 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 7e9f478f435dad2133a8b41431f4ac67c85f7ddf | |
| + git branch -D release-1.10 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.10 | |
| Switching to origin/release-1.10. | |
| + echo 'Switching to origin/release-1.10.' | |
| + git branch -f release-1.10 origin/release-1.10 | |
| + git checkout -q release-1.10 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.10 | |
| + UPSTREAM_HASH=6b64246e2588d1594664e1e83c72735acd279d26 | |
| + '[' 6b64246e2588d1594664e1e83c72735acd279d26 '!=' 557579c4c9d396c9e4aa1e46b64b9ad74a99a896 ']' | |
| Upstream branch upstream/release-1.10 moved from '557579c4c9d396c9e4aa1e46b64b9ad74a99a896' to '6b64246e2588d1594664e1e83c72735acd279d26'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.10 moved from '\''557579c4c9d396c9e4aa1e46b64b9ad74a99a896'\'' to '\''6b64246e2588d1594664e1e83c72735acd279d26'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiextensions-apiserver release-1.10 release-1.10 apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local src_branch=release-1.10 | |
| + local dst_branch=release-1.10 | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 13 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.10 commit f584b16eb23bd2a3fd292a027d698d95db427c5d. | |
| + echo 'Starting at existing release-1.10 commit f584b16eb23bd2a3fd292a027d698d95db427c5d.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.10 | |
| Branch upstream-branch set up to track remote branch release-1.10 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26. | |
| + echo 'Checked out source commit 6b64246e2588d1594664e1e83c72735acd279d26.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.10 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.10 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=c2060cdf986cb4843707c6a36df3b49998242605 | |
| + '[' -z c2060cdf986cb4843707c6a36df3b49998242605 ']' | |
| ++ git-find-merge c2060cdf986cb4843707c6a36df3b49998242605 upstream/release-1.10 | |
| ++ tail -1 | |
| +++ git rev-list 'c2060cdf986cb4843707c6a36df3b49998242605^1..upstream/release-1.10' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list c2060cdf986cb4843707c6a36df3b49998242605..upstream/release-1.10 --ancestry-path | |
| +++ git rev-parse c2060cdf986cb4843707c6a36df3b49998242605 | |
| + local k_base_merge=c2060cdf986cb4843707c6a36df3b49998242605 | |
| + '[' -z c2060cdf986cb4843707c6a36df3b49998242605 ']' | |
| + git branch -f filtered-branch-base c2060cdf986cb4843707c6a36df3b49998242605 | |
| Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apiextensions-apiserver. | |
| + echo 'Rewriting upstream branch release-1.10 to only include commits for staging/src/k8s.io/apiextensions-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiextensions-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| Running git filter-branch ... | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiextensions-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=c32d479c5876dce593193bd82f9118a14664df7e | |
| ++ git log --first-parent --format=%H --reverse c32d479c5876dce593193bd82f9118a14664df7e..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.10.' | |
| + git checkout -q release-1.10 | |
| Checking out branch release-1.10. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' f584b16eb23bd2a3fd292a027d698d95db427c5d '!=' f584b16eb23bd2a3fd292a027d698d95db427c5d ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| Removing k8s.io/* dependencies from Godeps.json | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiextensions-apiserver/") or . == "k8s.io/apiextensions-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| Running godep restore. | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=c2060cdf986cb4843707c6a36df3b49998242605 | |
| + '[' -z c2060cdf986cb4843707c6a36df3b49998242605 ']' | |
| ++ git-find-merge c2060cdf986cb4843707c6a36df3b49998242605 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'c2060cdf986cb4843707c6a36df3b49998242605^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list c2060cdf986cb4843707c6a36df3b49998242605..upstream-branch --ancestry-path | |
| +++ git rev-parse c2060cdf986cb4843707c6a36df3b49998242605 | |
| + local k_last_kube_merge=c2060cdf986cb4843707c6a36df3b49998242605 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605.' | |
| Looking up which commit in the release-1.10 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b c2060cdf986cb4843707c6a36df3b49998242605 ../kube-commits-apimachinery-release-1.10 | |
| + '[' -z e386b2658ed20923da8cc9250e552f082899a1ee ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee | |
| + echo 'Checking out k8s.io/apimachinery to e386b2658ed20923da8cc9250e552f082899a1ee' | |
| + git checkout -q e386b2658ed20923da8cc9250e552f082899a1ee | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.10 | |
| Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605. | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/api corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b c2060cdf986cb4843707c6a36df3b49998242605 ../kube-commits-api-release-1.10 | |
| + '[' -z 8b7507fac302640dd5f1efbf9643199952cc58db ']' | |
| + pushd ../api | |
| Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + echo 'Checking out k8s.io/api to 8b7507fac302640dd5f1efbf9643199952cc58db' | |
| + git checkout -q 8b7507fac302640dd5f1efbf9643199952cc58db | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-7.0 | |
| Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605. | |
| + echo 'Looking up which commit in the release-7.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b c2060cdf986cb4843707c6a36df3b49998242605 ../kube-commits-client-go-release-7.0 | |
| + '[' -z a312bfe35c401f70e5ea0add48b50da283031dc3 ']' | |
| + pushd ../client-go | |
| Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| + echo 'Checking out k8s.io/client-go to a312bfe35c401f70e5ea0add48b50da283031dc3' | |
| + git checkout -q a312bfe35c401f70e5ea0add48b50da283031dc3 | |
| Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605. | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b c2060cdf986cb4843707c6a36df3b49998242605 ../kube-commits-apiserver-release-1.10 | |
| + '[' -z d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 ']' | |
| + pushd ../apiserver | |
| Checking out k8s.io/apiserver to d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 | |
| + echo 'Checking out k8s.io/apiserver to d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3' | |
| + git checkout -q d3764d2f3b83b2ae6f414cbd65e3c68d67adfed3 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.10 | |
| + echo 'Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.10 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit c2060cdf986cb4843707c6a36df3b49998242605. | |
| ++ look -b c2060cdf986cb4843707c6a36df3b49998242605 ../kube-commits-code-generator-release-1.10 | |
| + '[' -z 9de8e796a74d16d2a285165727d04c185ebca6dc ']' | |
| + pushd ../code-generator | |
| Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + echo 'Checking out k8s.io/code-generator to 9de8e796a74d16d2a285165727d04c185ebca6dc' | |
| + git checkout -q 9de8e796a74d16d2a285165727d04c185ebca6dc | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.10 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| Remove redundant godep commits on-top of f584b16eb23bd2a3fd292a027d698d95db427c5d. | |
| + echo 'Remove redundant godep commits on-top of f584b16eb23bd2a3fd292a027d698d95db427c5d.' | |
| + git reset --soft -q f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + local repo=apiextensions-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'f584b16 Merge pull request #65169 from sttts/automated-cherry-pick-of-#65092-upstream-release-1.10' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.10' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.10 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.10 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiextensions-apiserver-release-1.10.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiextensions-apiserver-release-1.10.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.10 --push-script ../push-tags-apiextensions-apiserver-release-1.10.sh --dependencies apimachinery:release-1.10,api:release-1.10,client-go:release-7.0,apiserver:release-1.10,code-generator:release-1.10 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.10 | |
| + '[' f584b16eb23bd2a3fd292a027d698d95db427c5d '!=' f584b16eb23bd2a3fd292a027d698d95db427c5d ']' | |
| + git checkout release-1.10 | |
| Already on 'release-1.10' | |
| Your branch is up-to-date with 'origin/release-1.10'. | |
| [24 Sep 18 08:45 UTC]: Successfully constructed release-1.10 | |
| [24 Sep 18 08:45 UTC]: /publish_scripts/construct.sh apiextensions-apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiextensions-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiextensions-apiserver | |
| + SRC_BRANCH=release-1.11 | |
| + DST_BRANCH=release-1.11 | |
| + DEPS=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiextensions-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=f818aa3443bc9820a54afb479a553e5cc3c4dc3a | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q f584b16eb23bd2a3fd292a027d698d95db427c5d | |
| + git branch -D release-1.11 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.11 | |
| Switching to origin/release-1.11. | |
| + echo 'Switching to origin/release-1.11.' | |
| + git branch -f release-1.11 origin/release-1.11 | |
| + git checkout -q release-1.11 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.11 | |
| + UPSTREAM_HASH=bdfaef1882ff1e7693367b41eb43f92fb150cd66 | |
| + '[' bdfaef1882ff1e7693367b41eb43f92fb150cd66 '!=' f818aa3443bc9820a54afb479a553e5cc3c4dc3a ']' | |
| Upstream branch upstream/release-1.11 moved from 'f818aa3443bc9820a54afb479a553e5cc3c4dc3a' to 'bdfaef1882ff1e7693367b41eb43f92fb150cd66'. We have to sync. | |
| + echo 'Upstream branch upstream/release-1.11 moved from '\''f818aa3443bc9820a54afb479a553e5cc3c4dc3a'\'' to '\''bdfaef1882ff1e7693367b41eb43f92fb150cd66'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiextensions-apiserver release-1.11 release-1.11 apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local src_branch=release-1.11 | |
| + local dst_branch=release-1.11 | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| 16750353bf974758fbed9f44c39b81dfe6decb71 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 14 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.11 commit 16750353bf974758fbed9f44c39b81dfe6decb71. | |
| + echo 'Starting at existing release-1.11 commit 16750353bf974758fbed9f44c39b81dfe6decb71.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.11 | |
| Branch upstream-branch set up to track remote branch release-1.11 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66. | |
| + echo 'Checked out source commit bdfaef1882ff1e7693367b41eb43f92fb150cd66.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.11 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.11 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream/release-1.11 | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream/release-1.11' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream/release-1.11 --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_base_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| + git branch -f filtered-branch-base f58f1bd657b67f725ced7c7520d531a421860e5a | |
| Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apiextensions-apiserver. | |
| + echo 'Rewriting upstream branch release-1.11 to only include commits for staging/src/k8s.io/apiextensions-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiextensions-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| Running git filter-branch ... | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiextensions-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=2c083b1c55d59b70be8fabe47bccc5f7a33f7e52 | |
| ++ git log --first-parent --format=%H --reverse 2c083b1c55d59b70be8fabe47bccc5f7a33f7e52..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.11.' | |
| + git checkout -q release-1.11 | |
| Checking out branch release-1.11. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| Fixing up godeps after a complete sync | |
| + echo 'Fixing up godeps after a complete sync' | |
| ++ git rev-parse HEAD | |
| + '[' 16750353bf974758fbed9f44c39b81dfe6decb71 '!=' 16750353bf974758fbed9f44c39b81dfe6decb71 ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiextensions-apiserver/") or . == "k8s.io/apiextensions-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + '[' -z f58f1bd657b67f725ced7c7520d531a421860e5a ']' | |
| ++ git-find-merge f58f1bd657b67f725ced7c7520d531a421860e5a upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'f58f1bd657b67f725ced7c7520d531a421860e5a^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list f58f1bd657b67f725ced7c7520d531a421860e5a..upstream-branch --ancestry-path | |
| +++ git rev-parse f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local k_last_kube_merge=f58f1bd657b67f725ced7c7520d531a421860e5a | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the release-1.11 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apimachinery-release-1.11 | |
| + '[' -z def12e63c512da17043b4f0293f52d1006603d9f ']' | |
| + pushd ../apimachinery | |
| + echo 'Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f' | |
| Checking out k8s.io/apimachinery to def12e63c512da17043b4f0293f52d1006603d9f | |
| + git checkout -q def12e63c512da17043b4f0293f52d1006603d9f | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/api corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-api-release-1.11 | |
| + '[' -z 4e7be11eab3ffcfc1876898b8272df53785a9504 ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504' | |
| + git checkout -q 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| Checking out k8s.io/api to 4e7be11eab3ffcfc1876898b8272df53785a9504 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| + local branch=release-8.0 | |
| + echo 'Looking up which commit in the release-8.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-client-go-release-8.0 | |
| + '[' -z f2f85107cac6fe04c30435ca0ac0c3318fd1b94c ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c' | |
| Checking out k8s.io/client-go to f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + git checkout -q f2f85107cac6fe04c30435ca0ac0c3318fd1b94c | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-apiserver-release-1.11 | |
| + '[' -z d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 ']' | |
| + pushd ../apiserver | |
| + echo 'Checking out k8s.io/apiserver to d296c96c12b7d15d7fb5fea7a05fb165f8fd4014' | |
| + git checkout -q d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| Checking out k8s.io/apiserver to d296c96c12b7d15d7fb5fea7a05fb165f8fd4014 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.11 | |
| + echo 'Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.11 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit f58f1bd657b67f725ced7c7520d531a421860e5a. | |
| ++ look -b f58f1bd657b67f725ced7c7520d531a421860e5a ../kube-commits-code-generator-release-1.11 | |
| + '[' -z 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 8c97d6ab64da020f8b151e9d3ed8af3172f5c390' | |
| + git checkout -q 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| Checking out k8s.io/code-generator to 8c97d6ab64da020f8b151e9d3ed8af3172f5c390 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| Running godep save. | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.11 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 16750353bf974758fbed9f44c39b81dfe6decb71 | |
| Remove redundant godep commits on-top of 16750353bf974758fbed9f44c39b81dfe6decb71. | |
| + echo 'Remove redundant godep commits on-top of 16750353bf974758fbed9f44c39b81dfe6decb71.' | |
| + git reset --soft -q 16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + local repo=apiextensions-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n '1675035 Merge pull request #67754 from sttts/automated-cherry-pick-of-#67169-upstream-release-1.11' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.11' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.11 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.11 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiextensions-apiserver-release-1.11.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiextensions-apiserver-release-1.11.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.11 --push-script ../push-tags-apiextensions-apiserver-release-1.11.sh --dependencies apimachinery:release-1.11,api:release-1.11,client-go:release-8.0,apiserver:release-1.11,code-generator:release-1.11 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| ++ git rev-parse release-1.11 | |
| + '[' 16750353bf974758fbed9f44c39b81dfe6decb71 '!=' 16750353bf974758fbed9f44c39b81dfe6decb71 ']' | |
| + git checkout release-1.11 | |
| Already on 'release-1.11' | |
| Your branch is up-to-date with 'origin/release-1.11'. | |
| [24 Sep 18 08:48 UTC]: Successfully constructed release-1.11 | |
| [24 Sep 18 08:48 UTC]: /publish_scripts/construct.sh apiextensions-apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/apiextensions-apiserver kubernetes kubernetes k8s.io false "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=apiextensions-apiserver | |
| + SRC_BRANCH=release-1.12 | |
| + DST_BRANCH=release-1.12 | |
| + DEPS=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + REQUIRED=k8s.io/code-generator | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/apiextensions-apiserver | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=false | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=b6f238a90600ebdba1804b7830c9322926b11ed5 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q 16750353bf974758fbed9f44c39b81dfe6decb71 | |
| + git branch -D release-1.12 | |
| + git remote set-head origin -d | |
| + git rev-parse origin/release-1.12 | |
| Switching to origin/release-1.12. | |
| + echo 'Switching to origin/release-1.12.' | |
| + git branch -f release-1.12 origin/release-1.12 | |
| + git checkout -q release-1.12 | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/release-1.12 | |
| + UPSTREAM_HASH=aa8089fd81e2b5ee46ec02d486f8fe855e38320b | |
| + '[' aa8089fd81e2b5ee46ec02d486f8fe855e38320b '!=' b6f238a90600ebdba1804b7830c9322926b11ed5 ']' | |
| + echo 'Upstream branch upstream/release-1.12 moved from '\''b6f238a90600ebdba1804b7830c9322926b11ed5'\'' to '\''aa8089fd81e2b5ee46ec02d486f8fe855e38320b'\''. We have to sync.' | |
| Upstream branch upstream/release-1.12 moved from 'b6f238a90600ebdba1804b7830c9322926b11ed5' to 'aa8089fd81e2b5ee46ec02d486f8fe855e38320b'. We have to sync. | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/apiextensions-apiserver release-1.12 release-1.12 apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator k8s.io false 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local src_branch=release-1.12 | |
| + local dst_branch=release-1.12 | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| ca1024863b48cf0701229109df75ac5f0bb4907e | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 14 = 0 ']' | |
| ++ git rev-parse HEAD | |
| Starting at existing release-1.12 commit ca1024863b48cf0701229109df75ac5f0bb4907e. | |
| + echo 'Starting at existing release-1.12 commit ca1024863b48cf0701229109df75ac5f0bb4907e.' | |
| + git branch -D filtered-branch | |
| + git branch -f upstream-branch upstream/release-1.12 | |
| Branch upstream-branch set up to track remote branch release-1.12 from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b. | |
| + echo 'Checked out source commit aa8089fd81e2b5ee46ec02d486f8fe855e38320b.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit release-1.12 | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B release-1.12 | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream/release-1.12 | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream/release-1.12' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream/release-1.12 --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_base_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| + git branch -f filtered-branch-base a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apiextensions-apiserver. | |
| Running git filter-branch ... | |
| + echo 'Rewriting upstream branch release-1.12 to only include commits for staging/src/k8s.io/apiextensions-apiserver.' | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/apiextensions-apiserver 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/apiextensions-apiserver | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/apiextensions-apiserver -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=816aa754a5182fc1b8a7c76e8a7004b2507a6be9 | |
| ++ git log --first-parent --format=%H --reverse 816aa754a5182fc1b8a7c76e8a7004b2507a6be9..HEAD | |
| + f_mainline_commits= | |
| + echo 'Checking out branch release-1.12.' | |
| + git checkout -q release-1.12 | |
| Checking out branch release-1.12. | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + break | |
| + echo 'Fixing up godeps after a complete sync' | |
| Fixing up godeps after a complete sync | |
| ++ git rev-parse HEAD | |
| + '[' ca1024863b48cf0701229109df75ac5f0bb4907e '!=' ca1024863b48cf0701229109df75ac5f0bb4907e ']' | |
| + '[' false = true ']' | |
| + fix-godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io/code-generator k8s.io false true false Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local required_packages=k8s.io/code-generator | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local needs_godeps_update=true | |
| + local squash=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + '[' true = true ']' | |
| + update_full_godeps apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 k8s.io false Kubernetes-commit | |
| + local deps=apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local base_package=k8s.io | |
| + local is_library=false | |
| + local commit_msg_tag=Kubernetes-commit | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for d in '$../*' | |
| + '[' '!' -d '$../*' ']' | |
| + continue | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + echo 'Removing k8s.io/* dependencies from Godeps.json' | |
| + local dep= | |
| + local branch= | |
| + local depbranch= | |
| Removing k8s.io/* dependencies from Godeps.json | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/api/") or . == "k8s.io/api") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiserver/") or . == "k8s.io/apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/code-generator/") or . == "k8s.io/code-generator") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + for depbranch in '${deps//,/ }' '$(basename "${PWD}")' | |
| + IFS=: | |
| + read dep branch | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/apiextensions-apiserver/") or . == "k8s.io/apiextensions-apiserver") | not))' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| Running godep restore. | |
| + echo 'Running godep restore.' | |
| + godep restore | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + '[' -z a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ']' | |
| ++ git-find-merge a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list 'a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33..upstream-branch --ancestry-path | |
| +++ git rev-parse a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local k_last_kube_merge=a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 | |
| + local dep_count=5 | |
| + (( i=0 )) | |
| + (( i<5 )) | |
| + local dep=apimachinery | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apimachinery-release-1.12 | |
| + '[' -z 6dd46049f39503a1fc8d65de4bd566829e95faff ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + echo 'Checking out k8s.io/apimachinery to 6dd46049f39503a1fc8d65de4bd566829e95faff' | |
| + git checkout -q 6dd46049f39503a1fc8d65de4bd566829e95faff | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=api | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/api corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-api-release-1.12 | |
| + '[' -z 8b2bf3fd233a3ac3873005b3b70ecce09065fddc ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc' | |
| Checking out k8s.io/api to 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| + git checkout -q 8b2bf3fd233a3ac3873005b3b70ecce09065fddc | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=client-go | |
| + local branch=release-9.0 | |
| + echo 'Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-9.0 branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-client-go-release-9.0 | |
| + '[' -z 173ad5fde8e4ee8f92763f78c6ba37322f2125ab ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab' | |
| Checking out k8s.io/client-go to 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| + git checkout -q 173ad5fde8e4ee8f92763f78c6ba37322f2125ab | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=apiserver | |
| + local branch=release-1.12 | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the release-1.12 branch of k8s.io/apiserver corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-apiserver-release-1.12 | |
| + '[' -z 3f9daea3953cd4cde09c36c8c509ae8189bd6473 ']' | |
| + pushd ../apiserver | |
| Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| + echo 'Checking out k8s.io/apiserver to 3f9daea3953cd4cde09c36c8c509ae8189bd6473' | |
| + git checkout -q 3f9daea3953cd4cde09c36c8c509ae8189bd6473 | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + local dep=code-generator | |
| + local branch=release-1.12 | |
| Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33. | |
| + echo 'Looking up which commit in the release-1.12 branch of k8s.io/code-generator corresponds to k8s.io/kubernetes commit a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b a5d1aa6c70cff3eaa8feaaee6f0fa4935cbefa33 ../kube-commits-code-generator-release-1.12 | |
| + '[' -z 3dcf91f64f638563e5106f21f50c31fa361c918d ']' | |
| + pushd ../code-generator | |
| + echo 'Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d' | |
| + git checkout -q 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| Checking out k8s.io/code-generator to 3dcf91f64f638563e5106f21f50c31fa361c918d | |
| + popd | |
| + (( i++ )) | |
| + (( i<5 )) | |
| + rm -rf ./Godeps | |
| + rm -rf ./vendor | |
| Running godep save. | |
| + echo 'Running godep save.' | |
| + godep save ./... | |
| + cp Godeps/Godeps.json Godeps/Godeps.json.preserve | |
| + git checkout HEAD Godeps/ | |
| + mv Godeps/Godeps.json.preserve Godeps/Godeps.json | |
| + jq 'del(.Deps[].Comment)' Godeps/Godeps.json | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + '[' false = true ']' | |
| + git add Godeps/Godeps.json | |
| + git clean -f Godeps | |
| + git add vendor/ --ignore-errors | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ and Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing vendor/ and Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' release-1.12 '!=' master ']' | |
| + '[' -d vendor/ ']' | |
| + '[' false = true ']' | |
| + '[' -n k8s.io/code-generator ']' | |
| + IFS=, | |
| + read -a pkg_array | |
| + local pkg_count=1 | |
| + (( i=0 )) | |
| + (( i<1 )) | |
| + local pkg=k8s.io/code-generator | |
| + rm -rf vendor/k8s.io/code-generator | |
| + mkdir -p vendor/k8s.io/code-generator | |
| + cp -ax /go-workspace/src/k8s.io/code-generator/CONTRIBUTING.md /go-workspace/src/k8s.io/code-generator/Godeps /go-workspace/src/k8s.io/code-generator/LICENSE /go-workspace/src/k8s.io/code-generator/OWNERS /go-workspace/src/k8s.io/code-generator/README.md /go-workspace/src/k8s.io/code-generator/SECURITY_CONTACTS /go-workspace/src/k8s.io/code-generator/_examples /go-workspace/src/k8s.io/code-generator/cmd /go-workspace/src/k8s.io/code-generator/code-of-conduct.md /go-workspace/src/k8s.io/code-generator/generate-groups.sh /go-workspace/src/k8s.io/code-generator/generate-internal-groups.sh /go-workspace/src/k8s.io/code-generator/hack /go-workspace/src/k8s.io/code-generator/pkg /go-workspace/src/k8s.io/code-generator/third_party /go-workspace/src/k8s.io/code-generator/vendor vendor/k8s.io/code-generator/ | |
| + (( i++ )) | |
| + (( i<1 )) | |
| + git add vendor/k8s.io/code-generator | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing vendor/ with required packages: k8s.io/code-generator' | |
| + git commit -q -m 'sync: update required packages' | |
| Committing vendor/ with required packages: k8s.io/code-generator | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code ca1024863b48cf0701229109df75ac5f0bb4907e | |
| Remove redundant godep commits on-top of ca1024863b48cf0701229109df75ac5f0bb4907e. | |
| + echo 'Remove redundant godep commits on-top of ca1024863b48cf0701229109df75ac5f0bb4907e.' | |
| + git reset --soft -q ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ basename /go-workspace/src/k8s.io/apiextensions-apiserver | |
| + local repo=apiextensions-apiserver | |
| ++ git log --oneline --first-parent --merges | |
| ++ head -n 1 | |
| + '[' -n 'ba97476 Merge remote-tracking branch '\''origin/master'\'' into release-1.12' ']' | |
| + echo 'Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.12' | |
| Writing k8s.io/kubernetes commit lookup table to ../kube-commits-apiextensions-apiserver-release-1.12 | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /collapsed-kube-commit-mapper --commit-message-tag Kubernetes-commit --source-branch refs/heads/upstream-branch | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + LAST_BRANCH=release-1.12 | |
| ++ git rev-parse HEAD | |
| + LAST_HEAD=ca1024863b48cf0701229109df75ac5f0bb4907e | |
| + EXTRA_ARGS=() | |
| + PUSH_SCRIPT=../push-tags-apiextensions-apiserver-release-1.12.sh | |
| + echo '#!/bin/bash' | |
| + chmod +x ../push-tags-apiextensions-apiserver-release-1.12.sh | |
| + '[' -z '' ']' | |
| ++ echo kubernetes | |
| ++ echo kubernetes | |
| ++ sed 's/^./\L\u&/' | |
| + /sync-tags --prefix kubernetes- --commit-message-tag Kubernetes-commit --source-remote upstream --source-branch release-1.12 --push-script ../push-tags-apiextensions-apiserver-release-1.12.sh --dependencies apimachinery:release-1.12,api:release-1.12,client-go:release-9.0,apiserver:release-1.12,code-generator:release-1.12 -alsologtostderr '' | |
| Removing all local copies of origin and upstream tags. | |
| Fetching tags from remote "upstream". | |
| Fetching tags from remote "origin". | |
| Computing mapping from kube commits to the local branch because "kubernetes-1.12.0-rc.2" seems to be relevant. | |
| Checking that Godeps.json points to the actual tags in apimachinery, api, client-go, apiserver, code-generator. | |
| Bumping k8s.io/api in Godeps.json from "f73b6294046bc80005286315ef7becd02e52bc49" to kubernetes-1.12.0-rc.2: "f14efbe56879fd9b83959f8ede688c9e91f3277d". | |
| Bumping k8s.io/apimachinery in Godeps.json from "a00743c2fc9ef4b057da2ec96b056f7fe953ec0d" to kubernetes-1.12.0-rc.2: "705814234c8085247e99946887b0fbbd801efa08". | |
| Bumping k8s.io/apiserver in Godeps.json from "94b3f924e23bafc723c8f891f7ec287d897dede9" to kubernetes-1.12.0-rc.2: "d9d60f3d1def56591b8695b83c2c4f2f649f7c42". | |
| Bumping k8s.io/client-go in Godeps.json from "65879682f7e19558a98b988c448d3ee792d0872d" to kubernetes-1.12.0-rc.2: "8ad43087cf1443662581b6c92a9f66208cc3556a". | |
| Warning: dependency k8s.io/code-generator not found in Godeps.json. | |
| Adding extra commit fixing dependencies to point to kubernetes-1.12.0-rc.2 tags. | |
| Tagging 05b38a11a73e009ca1698ebe8c8b989d45e593b9 as "kubernetes-1.12.0-rc.2". | |
| ++ git rev-parse release-1.12 | |
| + '[' ca1024863b48cf0701229109df75ac5f0bb4907e '!=' ca1024863b48cf0701229109df75ac5f0bb4907e ']' | |
| + git checkout release-1.12 | |
| Previous HEAD position was 05b38a1... Fix Godeps.json to point to kubernetes-1.12.0-rc.2 tags | |
| Switched to branch 'release-1.12' | |
| Your branch is up-to-date with 'origin/release-1.12'. | |
| [24 Sep 18 08:50 UTC]: Successfully constructed release-1.12 | |
| [24 Sep 18 08:50 UTC]: Successfully ensured /go-workspace/src/k8s.io/metrics exists | |
| [24 Sep 18 08:50 UTC]: /bin/bash -c "git tag | xargs git tag -d >/dev/null" | |
| [24 Sep 18 08:50 UTC]: /publish_scripts/construct.sh metrics master master apimachinery:master,api:master,client-go:master /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/metrics kubernetes kubernetes k8s.io true "BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml" 400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + '[' '!' 14 -eq 14 ']' | |
| + REPO=metrics | |
| + SRC_BRANCH=master | |
| + DST_BRANCH=master | |
| + DEPS=apimachinery:master,api:master,client-go:master | |
| + REQUIRED= | |
| + SOURCE_REMOTE=/go-workspace/src/k8s.io/kubernetes/.git | |
| + SUBDIR=staging/src/k8s.io/metrics | |
| + SOURCE_REPO_ORG=kubernetes | |
| + SOURCE_REPO_NAME=kubernetes | |
| + shift 9 | |
| + BASE_PACKAGE=k8s.io | |
| + IS_LIBRARY=true | |
| + RECURSIVE_DELETE_PATTERN='BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + SKIP_TAGS= | |
| + LAST_PUBLISHED_UPSTREAM_HASH=400981797e38bee5c1b84f7a1f3914db7b74f196 | |
| + readonly REPO SRC_BRANCH DST_BRANCH DEPS REQUIRED SOURCE_REMOTE SOURCE_REPO_ORG SUBDIR SOURCE_REPO_NAME BASE_PACKAGE IS_LIBRARY RECURSIVE_DELETE_PATTERN SKIP_TAGS LAST_PUBLISHED_UPSTREAM_HASH | |
| ++ dirname /publish_scripts/construct.sh | |
| + SCRIPT_DIR=/publish_scripts | |
| + source /publish_scripts/util.sh | |
| ++ set -o errexit | |
| ++ set -o nounset | |
| ++ set -o pipefail | |
| ++ set -o xtrace | |
| Running garbage collection. | |
| + echo 'Running garbage collection.' | |
| + git gc --auto | |
| Fetching from origin. | |
| + echo 'Fetching from origin.' | |
| + git fetch origin --no-tags --prune | |
| Cleaning up checkout. | |
| + echo 'Cleaning up checkout.' | |
| + git rebase --abort | |
| No rebase in progress? | |
| + true | |
| + git reset -q --hard | |
| + git clean -q -f -f -d | |
| ++ git rev-parse HEAD | |
| + git checkout -q f055a87483416ed0281b93b4d1d9822b7427a91a | |
| + git branch -D master | |
| + git remote set-head origin -d | |
| + git rev-parse origin/master | |
| Switching to origin/master. | |
| + echo 'Switching to origin/master.' | |
| + git branch -f master origin/master | |
| + git checkout -q master | |
| Fetching upstream changes. | |
| + echo 'Fetching upstream changes.' | |
| + git remote | |
| + grep -w -q upstream | |
| + git remote set-url upstream /go-workspace/src/k8s.io/kubernetes/.git | |
| + git fetch -q upstream --no-tags --prune | |
| ++ git rev-parse upstream/master | |
| Upstream branch upstream/master moved from '400981797e38bee5c1b84f7a1f3914db7b74f196' to '7ffaa2f7131238db4cfdb034e260f6ad576cd70d'. We have to sync. | |
| + UPSTREAM_HASH=7ffaa2f7131238db4cfdb034e260f6ad576cd70d | |
| + '[' 7ffaa2f7131238db4cfdb034e260f6ad576cd70d '!=' 400981797e38bee5c1b84f7a1f3914db7b74f196 ']' | |
| + echo 'Upstream branch upstream/master moved from '\''400981797e38bee5c1b84f7a1f3914db7b74f196'\'' to '\''7ffaa2f7131238db4cfdb034e260f6ad576cd70d'\''. We have to sync.' | |
| + sync_repo kubernetes kubernetes staging/src/k8s.io/metrics master master apimachinery:master,api:master,client-go:master '' k8s.io true 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local source_repo_org=kubernetes | |
| + local source_repo_name=kubernetes | |
| + local subdirectory=staging/src/k8s.io/metrics | |
| + local src_branch=master | |
| + local dst_branch=master | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + shift 9 | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local commit_msg_tag=Kubernetes-commit | |
| + readonly subdirectory src_branch dst_branch deps is_library | |
| + local new_branch=false | |
| + local orphan=false | |
| + git rev-parse -q --verify HEAD | |
| c368fb9b71245441cd3268fffdba58b28b9b4863 | |
| ++ ls -1 | |
| ++ wc -l | |
| + '[' 11 = 0 ']' | |
| ++ git rev-parse HEAD | |
| + echo 'Starting at existing master commit c368fb9b71245441cd3268fffdba58b28b9b4863.' | |
| + git branch -D filtered-branch | |
| Starting at existing master commit c368fb9b71245441cd3268fffdba58b28b9b4863. | |
| + git branch -f upstream-branch upstream/master | |
| Branch upstream-branch set up to track remote branch master from upstream. | |
| ++ git rev-parse upstream-branch | |
| Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d. | |
| + echo 'Checked out source commit 7ffaa2f7131238db4cfdb034e260f6ad576cd70d.' | |
| + git checkout -q upstream-branch -b filtered-branch | |
| + git reset -q --hard upstream-branch | |
| + local f_mainline_commits= | |
| + '[' false = true ']' | |
| + '[' false = true ']' | |
| ++ last-kube-commit Kubernetes-commit master | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B master | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ true | |
| + local k_base_commit=99f319567a5148f501e49da35c83478303eab38b | |
| + '[' -z 99f319567a5148f501e49da35c83478303eab38b ']' | |
| ++ git-find-merge 99f319567a5148f501e49da35c83478303eab38b upstream/master | |
| ++ tail -1 | |
| +++ git rev-list '99f319567a5148f501e49da35c83478303eab38b^1..upstream/master' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 99f319567a5148f501e49da35c83478303eab38b..upstream/master --ancestry-path | |
| +++ git rev-parse 99f319567a5148f501e49da35c83478303eab38b | |
| + local k_base_merge=99f319567a5148f501e49da35c83478303eab38b | |
| + '[' -z 99f319567a5148f501e49da35c83478303eab38b ']' | |
| + git branch -f filtered-branch-base 99f319567a5148f501e49da35c83478303eab38b | |
| Rewriting upstream branch master to only include commits for staging/src/k8s.io/metrics. | |
| + echo 'Rewriting upstream branch master to only include commits for staging/src/k8s.io/metrics.' | |
| Running git filter-branch ... | |
| + filter-branch Kubernetes-commit staging/src/k8s.io/metrics 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' filtered-branch filtered-branch-base | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local subdirectory=staging/src/k8s.io/metrics | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + echo 'Running git filter-branch ...' | |
| + local index_filter= | |
| + '[' -n 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + patterns=() | |
| + local patterns | |
| + local p= | |
| + index_filter='git rm -q --cached --ignore-unmatch -r' | |
| + IFS=' ' | |
| + read -ra patterns | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''*/BUILD.bazel'\''' | |
| + for p in '"${patterns[@]}"' | |
| + index_filter+=' '\''Gopkg.toml'\''' | |
| + git filter-branch -f --index-filter 'git rm -q --cached --ignore-unmatch -r '\''BUILD'\'' '\''*/BUILD'\'' '\''BUILD.bazel'\'' '\''*/BUILD.bazel'\'' '\''Gopkg.toml'\''' --msg-filter 'awk 1 && echo && echo "Kubernetes-commit: ${GIT_COMMIT}"' --subdirectory-filter staging/src/k8s.io/metrics -- filtered-branch filtered-branch-base | |
| ++ git rev-parse filtered-branch-base | |
| + local f_base_commit=97a89e135cf9dec43f82189a1a107f704c47e63f | |
| ++ git log --first-parent --format=%H --reverse 97a89e135cf9dec43f82189a1a107f704c47e63f..HEAD | |
| Checking out branch master. | |
| + f_mainline_commits=7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + echo 'Checking out branch master.' | |
| + git checkout -q master | |
| + '[' -f kubernetes-sha ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| ++ git rev-parse HEAD | |
| + local dst_old_head=c368fb9b71245441cd3268fffdba58b28b9b4863 | |
| + local k_pending_merge_commit= | |
| + local dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + local dst_merge_point_commit=c368fb9b71245441cd3268fffdba58b28b9b4863 | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' 7329a008012f4a662ca1aea5d27c85fc37fe1d8e = FLUSH_PENDING_MERGE_COMMIT ']' | |
| ++ kube-commit Kubernetes-commit 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| ++ commit-message 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ git show --format=%B -q 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + k_mainline_commit=429fe2ab7355eaec3f2775fc47aec93d1740df0d | |
| ++ git-find-merge 429fe2ab7355eaec3f2775fc47aec93d1740df0d upstream-branch | |
| ++ tail -1 | |
| +++ git rev-list '429fe2ab7355eaec3f2775fc47aec93d1740df0d^1..upstream-branch' --first-parent | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 429fe2ab7355eaec3f2775fc47aec93d1740df0d..upstream-branch --ancestry-path | |
| +++ git rev-parse 429fe2ab7355eaec3f2775fc47aec93d1740df0d | |
| + k_new_pending_merge_commit=cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + '[' cdadc117e1ea8d28e5df3cebf5fae4f11558c547 = 429fe2ab7355eaec3f2775fc47aec93d1740df0d ']' | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + k_pending_merge_commit=cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + '[' 7329a008012f4a662ca1aea5d27c85fc37fe1d8e = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + '[' master '!=' master ']' | |
| + '[' master '!=' master ']' | |
| + is-merge 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ git show --format=short -q 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + return 1 | |
| + local pick_args= | |
| + is-merge 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + grep -q '^Merge: ' | |
| ++ short-commit-message 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ git show --format=short -q 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + return 1 | |
| ++ commit-subject 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ git show --format=%s -q 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| Cherry-picking k8s.io/kubernetes single-commit 429fe2ab7355eaec3f2775fc47aec93d1740df0d: Update custom metrics conversion functions. | |
| + echo 'Cherry-picking k8s.io/kubernetes single-commit 429fe2ab7355eaec3f2775fc47aec93d1740df0d: Update custom metrics conversion functions.' | |
| + local squash_commits=1 | |
| + godep-changes 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + '[' -n '' ']' | |
| + git diff --exit-code --quiet '7329a008012f4a662ca1aea5d27c85fc37fe1d8e^' 7329a008012f4a662ca1aea5d27c85fc37fe1d8e -- Godeps/Godeps.json | |
| ++ commit-date 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| ++ git show --format=%aD -q 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 11:22:36 -0400' | |
| + git cherry-pick --keep-redundant-commits 7329a008012f4a662ca1aea5d27c85fc37fe1d8e | |
| + squash 1 | |
| ++ git rev-parse HEAD | |
| + local head=fc88fa200fc0bd7d4807a65cf86a77c4dc30b3db | |
| + git reset -q --soft HEAD~1 | |
| ++ committer-date fc88fa200fc0bd7d4807a65cf86a77c4dc30b3db | |
| ++ git show --format=%cD -q fc88fa200fc0bd7d4807a65cf86a77c4dc30b3db | |
| + GIT_COMMITTER_DATE='Tue, 18 Sep 2018 11:22:36 -0400' | |
| + git commit --allow-empty -q -C fc88fa200fc0bd7d4807a65cf86a77c4dc30b3db | |
| + '[' -z cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ']' | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + for f_mainline_commit in '${f_mainline_commits}' FLUSH_PENDING_MERGE_COMMIT | |
| + local k_mainline_commit= | |
| + local k_new_pending_merge_commit= | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + k_new_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' -n cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ']' | |
| + '[' FLUSH_PENDING_MERGE_COMMIT '!=' cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ']' | |
| + local dst_parent2=HEAD | |
| + '[' master '!=' master ']' | |
| ++ commit-subject cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| ++ git show --format=%s -q cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| Cherry-picking source dropped-merge cdadc117e1ea8d28e5df3cebf5fae4f11558c547: Merge pull request #68795 from damemi/custom-metrics-conversion-fix. | |
| + echo 'Cherry-picking source dropped-merge cdadc117e1ea8d28e5df3cebf5fae4f11558c547: Merge pull request #68795 from damemi/custom-metrics-conversion-fix.' | |
| ++ commit-date cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| ++ git show --format=%aD -q cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + local 'date=Wed, 19 Sep 2018 11:35:02 -0700' | |
| +++ commit-message cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| +++ git show --format=%B -q cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| +++ echo | |
| +++ echo 'Kubernetes-commit: cdadc117e1ea8d28e5df3cebf5fae4f11558c547' | |
| ++ GIT_COMMITTER_DATE='Wed, 19 Sep 2018 11:35:02 -0700' | |
| ++ GIT_AUTHOR_DATE='Wed, 19 Sep 2018 11:35:02 -0700' | |
| ++ git commit-tree -p c368fb9b71245441cd3268fffdba58b28b9b4863 -p HEAD -m 'Merge pull request #68795 from damemi/custom-metrics-conversion-fix | |
| Update custom metrics conversion functions | |
| Kubernetes-commit: cdadc117e1ea8d28e5df3cebf5fae4f11558c547' 'HEAD^{tree}' | |
| + local dst_new_merge=44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| + git reset -q --hard 44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| + fix-godeps apimachinery:master,api:master,client-go:master '' k8s.io true false true Kubernetes-commit 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' '' = true ']' | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local required_packages= | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local needs_godeps_update=false | |
| + local squash=true | |
| + local commit_msg_tag=Kubernetes-commit | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| ++ git rev-parse HEAD | |
| + local dst_old_commit=44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| + '[' false = true ']' | |
| + '[' -f Godeps/Godeps.json ']' | |
| + checkout-deps-to-kube-commit Kubernetes-commit apimachinery:master,api:master,client-go:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps=() | |
| + local deps | |
| + IFS=, | |
| + read -a deps | |
| ++ last-kube-commit Kubernetes-commit HEAD | |
| ++ local commit_msg_tag=Kubernetes-commit | |
| ++ git log --format=%B HEAD | |
| ++ grep '^Kubernetes-commit: ' | |
| ++ head -n 1 | |
| ++ sed 's/^Kubernetes-commit: //g' | |
| + local k_last_kube_commit=cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + '[' -z cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ']' | |
| ++ git-find-merge cdadc117e1ea8d28e5df3cebf5fae4f11558c547 upstream-branch | |
| ++ tail -1 | |
| ++ awk 'NR==FNR{a[$1]++;next} a[$1] ' /dev/fd/63 /dev/fd/62 | |
| +++ git rev-list 'cdadc117e1ea8d28e5df3cebf5fae4f11558c547^1..upstream-branch' --first-parent | |
| +++ git rev-list cdadc117e1ea8d28e5df3cebf5fae4f11558c547..upstream-branch --ancestry-path | |
| +++ git rev-parse cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + local k_last_kube_merge=cdadc117e1ea8d28e5df3cebf5fae4f11558c547 | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547.' | |
| Looking up which commit in the master branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547. | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| ++ look -b cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ../kube-commits-apimachinery-master | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + pushd ../apimachinery | |
| Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + echo 'Checking out k8s.io/apimachinery to 99c5fa21f87204c2875a7f7ba977895d79b35c44' | |
| + git checkout -q 99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547.' | |
| + local k_commit= | |
| + local dep_commit= | |
| Looking up which commit in the master branch of k8s.io/api corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547. | |
| + read k_commit dep_commit | |
| ++ look -b cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ../kube-commits-api-master | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + pushd ../api | |
| + echo 'Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff' | |
| Checking out k8s.io/api to f456898a08e4bbc5891694118f3819f324de12ff | |
| + git checkout -q f456898a08e4bbc5891694118f3819f324de12ff | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| + local branch=master | |
| + echo 'Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547.' | |
| + local k_commit= | |
| + local dep_commit= | |
| + read k_commit dep_commit | |
| Looking up which commit in the master branch of k8s.io/client-go corresponds to k8s.io/kubernetes commit cdadc117e1ea8d28e5df3cebf5fae4f11558c547. | |
| ++ look -b cdadc117e1ea8d28e5df3cebf5fae4f11558c547 ../kube-commits-client-go-master | |
| Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + '[' -z 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + pushd ../client-go | |
| + echo 'Checking out k8s.io/client-go to 93821fae8052eae2e5ab4cac6ee2214e990e9401' | |
| + git checkout -q 93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + popd | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + update-deps-in-godep-json apimachinery:master,api:master,client-go:master k8s.io true Kubernetes-commit | |
| + '[' '!' -f Godeps/Godeps.json ']' | |
| + local base_package=k8s.io | |
| + local is_library=true | |
| + local deps=apimachinery:master,api:master,client-go:master | |
| + local commit_msg_tag=Kubernetes-commit | |
| + deps_array=() | |
| + local deps_array | |
| + IFS=, | |
| + read -a deps_array | |
| + local dep_count=3 | |
| + (( i=0 )) | |
| + (( i<3 )) | |
| + local dep=apimachinery | |
| ++ cd ../apimachinery | |
| ++ git rev-parse HEAD | |
| + local dep_commit=99c5fa21f87204c2875a7f7ba977895d79b35c44 | |
| + '[' -z 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/apimachinery/") or . == "k8s.io/apimachinery") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=0dbe21f815eb26c3e48873dbc609191001553a3c | |
| + '[' -n 0dbe21f815eb26c3e48873dbc609191001553a3c ']' | |
| + '[' 0dbe21f815eb26c3e48873dbc609191001553a3c '!=' 99c5fa21f87204c2875a7f7ba977895d79b35c44 ']' | |
| + echo 'Updating k8s.io/apimachinery dependency to 99c5fa21f87204c2875a7f7ba977895d79b35c44.' | |
| Updating k8s.io/apimachinery dependency to 99c5fa21f87204c2875a7f7ba977895d79b35c44. | |
| + sed -i s/0dbe21f815eb26c3e48873dbc609191001553a3c/99c5fa21f87204c2875a7f7ba977895d79b35c44/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=api | |
| ++ cd ../api | |
| ++ git rev-parse HEAD | |
| + local dep_commit=f456898a08e4bbc5891694118f3819f324de12ff | |
| + '[' -z f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/api/") or . == "k8s.io/api") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=49f236fe119e127d67dec93a9d41ae1c5ed5079e | |
| + '[' -n 49f236fe119e127d67dec93a9d41ae1c5ed5079e ']' | |
| + '[' 49f236fe119e127d67dec93a9d41ae1c5ed5079e '!=' f456898a08e4bbc5891694118f3819f324de12ff ']' | |
| + echo 'Updating k8s.io/api dependency to f456898a08e4bbc5891694118f3819f324de12ff.' | |
| Updating k8s.io/api dependency to f456898a08e4bbc5891694118f3819f324de12ff. | |
| + sed -i s/49f236fe119e127d67dec93a9d41ae1c5ed5079e/f456898a08e4bbc5891694118f3819f324de12ff/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + local dep=client-go | |
| ++ cd ../client-go | |
| ++ git rev-parse HEAD | |
| + local dep_commit=93821fae8052eae2e5ab4cac6ee2214e990e9401 | |
| + '[' -z 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| ++ jq -r '.Deps[] | select(.ImportPath | startswith("k8s.io/client-go/") or . == "k8s.io/client-go") | .Rev' Godeps/Godeps.json | |
| ++ tail -n 1 | |
| + local old_dep_commit=37c3c02ec96533daec0dbda1f39a6b1d68505c79 | |
| + '[' -n 37c3c02ec96533daec0dbda1f39a6b1d68505c79 ']' | |
| + '[' 37c3c02ec96533daec0dbda1f39a6b1d68505c79 '!=' 93821fae8052eae2e5ab4cac6ee2214e990e9401 ']' | |
| + echo 'Updating k8s.io/client-go dependency to 93821fae8052eae2e5ab4cac6ee2214e990e9401.' | |
| Updating k8s.io/client-go dependency to 93821fae8052eae2e5ab4cac6ee2214e990e9401. | |
| + sed -i s/37c3c02ec96533daec0dbda1f39a6b1d68505c79/93821fae8052eae2e5ab4cac6ee2214e990e9401/g Godeps/Godeps.json | |
| + (( i++ )) | |
| + (( i<3 )) | |
| + indent-godeps | |
| + unexpand --first-only --tabs=2 | |
| ++ basename /go-workspace/src/k8s.io/metrics | |
| ++ basename /go-workspace/src/k8s.io/metrics | |
| + jq '.Deps |= map(select(.ImportPath | (startswith("k8s.io/metrics/") or . == "k8s.io/metrics") | not))' Godeps/Godeps.json | |
| + mv Godeps/Godeps.json.clean Godeps/Godeps.json | |
| + git add Godeps/Godeps.json | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 1 | |
| + echo 'Committing Godeps/Godeps.json.' | |
| + git commit -q -m 'sync: update godeps' | |
| Committing Godeps/Godeps.json. | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| ++ git rev-parse --abbrev-ref HEAD | |
| + '[' master '!=' master ']' | |
| + '[' -n '' ']' | |
| + apply-recursive-delete-pattern 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + local 'recursive_delete_pattern=BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' | |
| + '[' -z 'BUILD */BUILD BUILD.bazel */BUILD.bazel Gopkg.toml' ']' | |
| + local split_recursive_delete_pattern | |
| + read -r -a split_recursive_delete_pattern | |
| + git rm -q --ignore-unmatch -r BUILD '*/BUILD' BUILD.bazel '*/BUILD.bazel' Gopkg.toml | |
| + git add -u | |
| + git-index-clean | |
| + git diff --cached --exit-code | |
| + return 0 | |
| + git diff --exit-code 44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| + '[' true = true ']' | |
| + echo 'Amending last merge with godep changes.' | |
| + git reset --soft -q 44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| Amending last merge with godep changes. | |
| + git commit -q --amend --allow-empty -C 44c7b1c60e73c412e363afdd149ee63df7fce1c3 | |
| + ensure-clean-working-dir | |
| + git diff HEAD --exit-code | |
| + dst_needs_godeps_update=false | |
| ++ git rev-parse HEAD | |
| + dst_merge_point_commit=4f8f66899d0937c8328a075cf6abf54479457fa2 | |
| + k_pending_merge_commit=FLUSH_PENDING_MERGE_COMMIT | |
| + '[' FLUSH_PENDING_MERGE_COMMIT = FLUSH_PENDING_MERGE_COMMIT ']' | |
| + br |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment