trying without arguments
This commit is contained in:
parent
c0873817ad
commit
5256091070
2 changed files with 6 additions and 14 deletions
3
Jenkins/Phabricator-pipeline/Jenkinsfile
vendored
3
Jenkins/Phabricator-pipeline/Jenkinsfile
vendored
|
@ -20,6 +20,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
CONDUIT_TOKEN = credentials('phabricator-conduit-token')
|
CONDUIT_TOKEN = credentials('phabricator-conduit-token')
|
||||||
|
PHABRICATOR_HOST = 'https://reviews.llvm.org'
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage("git checkout"){
|
stage("git checkout"){
|
||||||
|
@ -34,7 +35,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
stage('arc patch') {
|
stage('arc patch') {
|
||||||
steps {
|
steps {
|
||||||
sh '${WORKSPACE}/llvm-premerge-checks/scripts/phabtalk/apply_patch.py --host="https://reviews.llvm.org" --conduit-token="${CONDUIT_TOKEN}"'
|
sh 'lvm-premerge-checks/scripts/phabtalk/apply_patch.py'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('CMake') {
|
stage('CMake') {
|
||||||
|
|
|
@ -19,15 +19,16 @@ from phabricator import Phabricator
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
args = _parse_args()
|
|
||||||
diff_id = os.environ['DIFF_ID']
|
diff_id = os.environ['DIFF_ID']
|
||||||
phid = os.environ['PHID']
|
phid = os.environ['PHID']
|
||||||
|
conduit_token = os.environ['CONDUIT_TOKEN']
|
||||||
|
host = os.environ['PHABRICATOR_HOST']
|
||||||
|
|
||||||
phab = Phabricator(token=args.conduit_token, host=args.host+'/api/')
|
phab = Phabricator(token=conduit_token, host=host+'/api/')
|
||||||
phab.update_interfaces()
|
phab.update_interfaces()
|
||||||
|
|
||||||
_git_checkout(_get_parent_hash(diff_id, phab))
|
_git_checkout(_get_parent_hash(diff_id, phab))
|
||||||
_apply_patch(diff_id, args.conduit_token, args.host)
|
_apply_patch(diff_id, conduit_token, host)
|
||||||
|
|
||||||
|
|
||||||
def _get_parent_hash(diff_id: str, phab:Phabricator) -> str:
|
def _get_parent_hash(diff_id: str, phab:Phabricator) -> str:
|
||||||
|
@ -46,16 +47,6 @@ def _apply_patch(diff_id: str, conduit_token: str, host: str):
|
||||||
diff_id, conduit_token, host )
|
diff_id, conduit_token, host )
|
||||||
subprocess.call(cmd, shell=True)
|
subprocess.call(cmd, shell=True)
|
||||||
|
|
||||||
|
|
||||||
def _parse_args():
|
|
||||||
parser = argparse.ArgumentParser(description='Apply a phabricator patch.')
|
|
||||||
parser.add_argument('--conduit-token', type=str, dest='conduit_token', default=None)
|
|
||||||
parser.add_argument('--host', type=str, dest='host', default="None",
|
|
||||||
help="full URL to API without trailing slash, e.g. https://reviews.llvm.org")
|
|
||||||
|
|
||||||
return parser.parse_args()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue