Skip to content

automator.sh now creates tickets in istio/istio on failed merges #3303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 3 commits into from
Apr 26, 2021
Merged

automator.sh now creates tickets in istio/istio on failed merges #3303

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
394ce83
automator.sh now creates tickets in istio/istio on failed merges
Apr 23, 2021
2db2d67
Responded to feedback
Apr 23, 2021
9660ffa
Actually removed gh login auth
Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion tools/automator/automator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,15 @@ merge() {
git -c "user.name=$user" -c "user.email=$email" merge --no-ff -m "$title" --log upstream/"$merge_branch"
local code=$?
if [ "$code" -ne 0 ]; then
print_error "$(git status)" 1
export GITHUB_TOKEN="$token"
local issue_exists
issue_exists=$(gh issue list -S "Automatic merge of $merge_branch into $branch failed." -R "istio/isio" | wc -l)
if [ "$issue_exists" -eq 0 ]; then
gh issue create -b "Automatic merge of $merge_branch into $branch failed. @istio/wg-networking-maintainers" -t "Automatic merge of upstream envoy release branch failed" -l "area/networking/envoy" -R "istio/istio"
print_error "Conflicts detected, manual merge is required. An issue in istio/istio has been created." 0
else
print_error "Conflicts detected, manual merge is required. An issue in istio/istio already exists." 0
fi
else
if [[ "$(git show --shortstat)" =~ $title ]]; then
git show --shortstat
Expand Down