Convert GERRIT_SILENT_MODE to int

GERRIT_SILENT_MODE must be int type.
Improve the scm_check feature.

Change-Id: I7e25c0b8265ec8f489c8a224920da561f2f48897
Signed-off-by: gaoxuesx <xuesongx.gao@intel.com>

diff --git a/common/iris_rest_client.py b/common/iris_rest_client.py
index 5ca5c1d..618b4f0 100644 (file)
--- a/common/iris_rest_client.py
+++ b/common/iris_rest_client.py
@@ -48,9 +48,10 @@ class IrisRestClient(object):
                                      headers=self.header, **kwargs)
         try:
             detail.update(response.json())
+            detail['status'] = response.status_code
         except ValueError:
             detail['detail'] = 'Server error, please contact the administrator!'
-        detail['status'] = response.status_code
+            detail['status'] = 'Error'
         return detail
 
     def scm_update(self, domain_file, gittree_file):

diff --git a/job_monitor_scm_meta_git.py b/job_monitor_scm_meta_git.py
index e204929..f574e03 100755 (executable)
--- a/job_monitor_scm_meta_git.py
+++ b/job_monitor_scm_meta_git.py
@@ -30,7 +30,7 @@ WORKSPACE = os.getenv('WORKSPACE')
 GERRIT_HOSTNAME = os.getenv('GERRIT_HOSTNAME')
 GERRIT_USERNAME = os.getenv('GERRIT_USERNAME')
 GERRIT_SSHPORT = os.getenv('GERRIT_SSHPORT')
-GERRIT_SILENT_MODE = os.getenv('GERRIT_SILENT_MODE')
+GERRIT_SILENT_MODE = int(os.getenv('GERRIT_SILENT_MODE'))
 
 
 def scm_check(client, gerrit, events, domains, gittrees):
@@ -53,7 +53,7 @@ def scm_check(client, gerrit, events, domains, gittrees):
             # return 1 if this exception is not caused by invalid commit
             if 'no such patch set' not in str(err):
                 return 1
-    else:
+    elif result['status'] in [406, 500]:
         try:
             gerrit.review(commit=events['patchset_revision'],
                           message=result['detail'], verified=-1)