adapted to new trigger method

Change-Id: Iaed4a53cf6896f956b326dc47580c5ac7e63603f
Signed-off-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/job_request.py b/job_request.py
index 37c6cc3..614e6a0 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -65,7 +65,7 @@ def obs_git_data(event_fields):
                           'targetpackage': 'OBS_REQ_PKG',
                           'targetproject': 'OBS_REQ_PRJ',
                           'time': 'OBS_REQ_TIME',
-                          'type': 'OBS_REQ_TYPE',
+                          'event_type': 'OBS_REQ_TYPE',
                           'when': 'OBS_REQ_WHEN',
                           'who': 'OBS_REQ_WHO'
                           }
@@ -272,6 +272,9 @@ def main():
 
     data = obs_git_data(event_fields)
 
+    # Get event type
+    event_type = event_fields['event_type']
+
     notify_submiter(event_fields, data)
 
     gerrit = Gerrit(os.getenv('GERRIT_HOSTNAME'), os.getenv('GERRIT_USERNAME'),
@@ -279,20 +282,19 @@ def main():
 
     gitprj = Git('%s/%s' % (os.getenv('GIT_CACHE_DIR'), data['GIT_PROJECT']))
 
-    if event_fields['type'] == 'OBS_SRCSRV_REQUEST_STATECHANGE':
+    if event_type == 'OBS_SRCSRV_REQUEST_STATECHANGE':
         if event_fields['state'] == 'declined':
             request_rejected(data, gerrit)
         elif event_fields['state'] == 'revoked':
             request_revoked(data)
-        trigger_next('reviewrepo_cleanup', data)
 
-    elif event_fields['type'] == 'OBS_SRCSRV_REQUEST_CREATE':
+    elif event_type == 'OBS_SRCSRV_REQUEST_CREATE':
         request_created(data)
-        trigger_next('pre_release_image', data)
 
-    elif event_fields['type'] == 'OBS_SRCSRV_REQUEST_ACCEPTED':
+    elif event_type == 'OBS_SRCSRV_REQUEST_ACCEPTED':
         request_accepted(data, gerrit, gitprj)
-        trigger_next('reviewrepo_cleanup', data)
+
+    trigger_next(event_type, data)
 
     return 0