Skip to content
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.

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

{CI} Auto merge release pull reqeust create by azclibot #4950

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
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
59 changes: 59 additions & 0 deletions scripts/release/auto_merge_pr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env python

# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import json
import logging
import requests
import shlex
import subprocess
import sys

logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
ch = logging.StreamHandler()
ch.setLevel(logging.DEBUG)
logger.addHandler(ch)


def auto_merge(headers, number):
# curl -X PUT https://api.github.com/repos/OWNER/REPO/pulls/PULL_NUMBER/merge
merge_url = f'https://api.github.com/repos/Azure/azure-cli-extensions/pulls/{number}/merge'
logger.debug(merge_url)
# merge_method: merge, squash or rebase
# we use `sqush and merge` button
body = {
'merge_method': 'squash'
}
try:
r = requests.put(merge_url, json=body, headers=headers)
except requests.RequestException as e:
raise e
if r.status_code != 200:
logger.debug(r)
logger.debug(r.text)
sys.exit(1)


def main():
try:
# get azclibot token
with open('/tmp/token.txt') as f:
token = f.readline().replace("\n", "")
Comment on lines +44 to +45
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not fetch token from keyvault?

Copy link
Member Author

@wangzelin007 wangzelin007 Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In old steps, we can use environment variable Azure subscription in Azure CLI option.
So it is easy to use azure cli command.
And the token.txt is get from the az keyvault commmand in last step, and the transfer between the two steps can only use a temporary file.
We have used another temporary file upgrade_extensions.txt to identify if there are extensions that need to be upgraded.
image

But new step I use python script which not support environment variable.
And after the job finished (about 4 mins) this agent will be delete, so I think it is safe.
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we use Arguments?

# get create_pr response
with open('/tmp/create_pr.json') as f:
ref = f.read()
except FileNotFoundError:
logger.debug('no PR create, no need to merge PR')
sys.exit(0)
headers = {'Authorization': 'token %s' % token}
# get pr id
number = json.loads(ref)['number']
auto_merge(headers, number)


if __name__ == '__main__':
main()