Fixes #11827: quality assistant cannot merge approved PR

Normation · Dec 5, 2017 · f00b0ec · f00b0ec
1 parent faa9797
commit f00b0ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/scripts/rudder-dev/quality-assistant b/scripts/rudder-dev/quality-assistant
@@ -134,7 +134,7 @@ def repo_merge(repo, alt_dir):
     freeze = True
 
   # List approved PR
-  api_url = "https://api.github.com/repos/Normation/{repo}/pulls?state=open"
+  api_url = "https://api.github.com/repos/Normation/{repo}/issues?state=open"
   url = api_url.format(repo=repo)
   data = github_call(url)
   for pr_info in data:

diff --git a/scripts/rudder-dev/redmine.py b/scripts/rudder-dev/redmine.py
@@ -188,7 +188,7 @@ def _update_issue(self, change, message=None, alt_message=None):
       info = { 'issue': { 'notes': alt_message } }
 
     # send info
-    ret = self.server._query("/issues/" + str(self.id) + ".json", post_data=json.dumps(info))
+    ret = self.server._query("/issues/" + str(self.id) + ".json", put_data=json.dumps(info))
     if ret.status_code != 200:
       logfail("Issue Update error: " + ret.reason)
       print(ret.text)
@@ -275,12 +275,14 @@ def __init__(self, internal):
       self.api_url = Config.REDMINE_API_URL
       self.nrm_group = Config.REDMINE_NRM_GROUP
 
-  def _query(self, query, post_data=None):
+  def _query(self, query, post_data=None, put_data=None):
     """ Function to directly request the right redmine server """
-    if post_data is None:
-      ret = requests.get(self.api_url + query, headers = {'X-Redmine-API-Key': self.token })
-    else:
+    if post_data is not None:
       ret = requests.post(self.api_url + query, headers = {'X-Redmine-API-Key': self.token, 'Content-Type': 'application/json' }, data = post_data)
+    elif put_data is None:
+      ret = requests.put(self.api_url + query, headers = {'X-Redmine-API-Key': self.token, 'Content-Type': 'application/json' }, data = put_data)
+    else:
+      ret = requests.get(self.api_url + query, headers = {'X-Redmine-API-Key': self.token })
     return ret
 
   def create_issue(self, project_id, subject, description, tracker_id, version_id):

diff --git a/scripts/rudder-dev/rudder-dev-src b/scripts/rudder-dev/rudder-dev-src
@@ -1777,7 +1777,10 @@ if __name__ == "__main__":
   elif arguments['technique']:
     technique(arguments['<version>'], arguments['<comment>'])
   elif arguments['subtask']:
+    stash()
     subtask(arguments['<next_branch>'], arguments['--title'], arguments['--base'], arguments['--bug'])
+    unstash()
+    stash_info()
   elif arguments['wip']:
     wip()
   elif arguments['commit']: