diff --git a/tools/jenkins-scripts/ci-release-test.py b/tools/jenkins-scripts/ci-release-test.py index 068875fcce..80d3c13065 100644 --- a/tools/jenkins-scripts/ci-release-test.py +++ b/tools/jenkins-scripts/ci-release-test.py @@ -48,25 +48,14 @@ def make_temp_dir(): os.system(cmd) def main(): - #get payload from os env - payload_str = os.environ['payload'] - payload_str = payload_str.decode('utf-8','ignore') - #parse to json obj - payload = json.loads(payload_str) - - #get pull number - tag = payload['tag'] + #get tag + tag = os.environ['tag'] print 'tag:' + tag - url = payload['html_url'] - print "url:" + url - pr_desc = '

' + tag + ' is release' + '

' - - #get statuses url - statuses_url = payload['statuses_url'] + pr_desc = '

' + tag + ' is release' + '

' #get pr target branch - branch = payload['branch'] + branch = 'develop' #set parent build description jenkins_url = os.environ['JENKINS_URL'] @@ -75,16 +64,6 @@ def main(): target_url = jenkins_url + 'job/' + job_name + '/' + build_number + '/' set_description(pr_desc, target_url) - - #set commit status to pending - data = {"state":"pending", "target_url":target_url} - access_token = os.environ['GITHUB_ACCESS_TOKEN'] - Headers = {"Authorization":"token " + access_token} - - try: - requests.post(statuses_url, data=json.dumps(data), headers=Headers) - except: - traceback.print_exc() #pull origin develop os.system('git reset --hard') diff --git a/tools/jenkins-scripts/job-comment-trigger.py b/tools/jenkins-scripts/job-comment-trigger.py index c33ac8eeae..9a26c61fc8 100644 --- a/tools/jenkins-scripts/job-comment-trigger.py +++ b/tools/jenkins-scripts/job-comment-trigger.py @@ -106,8 +106,12 @@ def main(): print 'job_trigger_url is: ', job_trigger_url #send trigger and payload - post_data = {'payload':""} - post_data['payload']= json.dumps(payload_forword) + if('tag' in payload_forword): + post_data = {'tag':""} + post_data['tag'] = payload_forword['tag'] + else: + post_data = {'payload':""} + post_data['payload']= json.dumps(payload_forword) requests.post(job_trigger_url, data=post_data) return(0)