From c9aef6d8f9d66be9c6fa226ce6345df3e3ae240c Mon Sep 17 00:00:00 2001 From: Manas Date: Jun 21 2019 14:39:47 +0000 Subject: pagure post issues fixed --- diff --git a/pgure/fesco.py b/pgure/fesco.py index 809c145..6192076 100644 --- a/pgure/fesco.py +++ b/pgure/fesco.py @@ -54,36 +54,40 @@ def fesissue(args, configpath): relengticket = data['attributes_values']['11371'] fedora_version = data['attributes_values']['11383'] print("this step") + bzid = list(bugzilla_id.split(', ')) + print(bzid) + print(bugzilla_id, " This is bugzilla_id") try: taiga_issue_link = str(config['TAIGA']['TAIGA_SITE_ISSUE_URL']) + str(taiga_isssue_ref) maillist_link = "random" maillist_dsc_list = "random" owner = "@" + str(owner) - with open("pagure_issue.txt", "w+") as p_txt: - p_txt.write("{}\n\n*{}\n*{}\n*{}\n*{}\n".format(summary, taiga_issue_link, maillist_link, maillist_dsc_list, owner)) - editor.edit(filename="pagure_issue.txt") + with open("fesco_issue.txt", "w+") as pg_txt: + pg_txt.write("{}\n\n*{}\n*{}\n*{}\n*{}\n".format(summary, taiga_issue_link, maillist_link, maillist_dsc_list, owner)) + editor.edit(filename="fesco_issue.txt") try: - with open("pagure_issue.txt", "r") as pg_txt: + with open("fesco_issue.txt", "r") as pg_txt: issue_text = pg_txt.read() if system_wide_change == True: syschange = "System-Wide Change" elif system_wide_change == False: syschange = "Self-Contained Change" - title = str(fedora_version) + ' ' + str(syschange) + ':' + str(subject) + title = "F" + str(fedora_version) + ' ' + str(syschange) + ':' + str(subject) print(issue_text) payload = { 'title': title, 'issue_content': issue_text } - print(title,payload) - r = pgaissues.post_issue(payload, config) + print(title, payload) + repo = config['PAGURE']['FESCO_REPO'] + r = pgaissues.post_issue(payload, repo, config) print(r) if r.status_code == 200: payload = { 'status': config['TAIGA']['IS_STATUS_READY_FOR_FESCO'], 'version': taiga_issue_version } - r = chagnestatus_issue(taiga_issue_id, payload, config) + r = tgaissue.changestatus_issue(taiga_issue_id, payload, config) print("Succesfully posted issue") else: print("Check logs for errors",json.loads(r.content)) diff --git a/pgure/issues.py b/pgure/issues.py index e4fe0c6..60e0c64 100644 --- a/pgure/issues.py +++ b/pgure/issues.py @@ -19,7 +19,7 @@ def list_issue(config): print(repo_name) """ headers = { - 'Content-Type': 'application/x-www-form-urlencoded', + 'Content-Type': 'application/json', 'Authorization': 'token {0}'.format(keyring.get_password(config['PAGURE']['SERVICE_ID'], "repo_name")) } url = str(config['PAGURE']['URL']) + '/issues' @@ -43,7 +43,7 @@ def get_issue(issueid, config): print(repo_name) """ headers = { - 'Content-Type': 'application/x-www-form-urlencoded', + 'Content-Type': 'application/json', 'Authorization': 'token {0}'.format(keyring.get_password(config['PAGURE']['SERVICE_ID'], "repo_name")) } url = str(config['PAGURE']['URL']) + "/issue/" + str(issueid) @@ -59,17 +59,17 @@ def get_issue(issueid, config): print(e) -def post_issue(payload, config): +def post_issue(payload, repo, config): """ Posts issue to pagure """ try: #repo_name = (config['PAGURE']['SERVICE_ID'], "repo_name") #print(repo_name) headers = { - #'Content-Type': 'application/x-www-form-urlencoded', + 'Content-Type': 'application/json', 'Authorization': 'token {0}'.format(keyring.get_password(config['PAGURE']['SERVICE_ID'], "repo_name")) } print(headers) - url = str(config['PAGURE']['API_URL']) + '/new_issue' + url = str(config['PAGURE']['API_URL']) + '/' + repo + '/new_issue' #print(data) # debug only print(url) print(payload)