adapte to file parameter trigger

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

diff --git a/images/__init__.py b/images/__init__.py
index 13b38d3..898d3e9 100644 (file)
--- a/images/__init__.py
+++ b/images/__init__.py
@@ -189,8 +189,7 @@ def generate_images_info(ks_list,
                 'pub_baseurl'  : pub_baseurl
             }
 
-        msg_body = json.dumps(msgbody_dict, sort_keys=True, indent=4)
-        ret_images_list.append(msg_body)
+        ret_images_list.append(msgbody_dict)
 
     return ret_images_list
 

diff --git a/job_imager.py b/job_imager.py
index 5be985f..fb13ad8 100755 (executable)
--- a/job_imager.py
+++ b/job_imager.py
@@ -18,6 +18,7 @@ except ImportError:
     import simplejson as json
 
 from common.envparas import export
+from common.triggerbuild import read_from
 
 P_NAME = 'imager' # component name in boss
 
@@ -38,10 +39,9 @@ CONFS = {}
 HOSTNAME = os.uname()[1]
 
 PARAM_LIST = {
-        'OBS_EVENT_STRING',
         'TASK_DIRECTORY',
         'DESTINATION_DIRECTORY',
-        'IMAGE_INFO',
+        'CONTENT',
         'REDIS_SERVER'
     }
 
@@ -82,9 +82,8 @@ def _change_url(ksc, conf_baseurl, relative_uri):
 
 def main():
 
-    s =  base64.b64decode(IMAGE_INFO)
-
-    fields = json.loads(s)
+    
+    fields = read_from(CONTENT)
 
     # dest_dir is reset to public directory
     CONFS['dest_dir'] = "%s" %(fields['images_path'])

diff --git a/job_repomaker.py b/job_repomaker.py
index a85fb2e..2efdb3e 100755 (executable)
--- a/job_repomaker.py
+++ b/job_repomaker.py
@@ -15,6 +15,7 @@ except ImportError:
 
 from common.envparas import export
 from common.buildservice import BuildService, TempBuildService
+from common.triggerbuild import read_from, write_to
 import repomaker
 import base64
 import time
@@ -45,7 +46,7 @@ PARAM_LIST = ['PATH_BUILDS',
               'MAILTO',
               'SANDBOX_REPO_BASEURL',
               'EMAIL_TEMPLATES_DIR',
-              'OBS_EVENT_STRING',
+              'CONTENT',
               'BUILD_TAG',
               'RSYNC_SERVER',
               'IMAGE_INFO',
@@ -157,9 +158,8 @@ if __name__ == "__main__":
     server_conf.email_templates_dir = EMAIL_TEMPLATES_DIR
 
     repo_conf_fn = None
-    # JOB is trigger by OBS event
-    event = json.loads(' '.join(OBS_EVENT_STRING.split()))
-    event_fields = event['fields']['obsEvent']
+
+    event_fields = read_from(CONTENT)
     
     if not event_fields:
         print "Invalid OBS event: %s" %(OBS_EVENT_STRING)
@@ -223,8 +223,7 @@ if __name__ == "__main__":
         image_info = image_dispatch(repoinfo)
         if image_info:
             for index, imagerinfo in enumerate(image_info):
-                with open('image_trigger_%s.env' %(index), 'w') as fp:
-                    fp.write("IMAGE_INFO=%s" %(base64.b64encode(imagerinfo)))
+                write_to('image_trigger_%s.env' %(index), imagerinfo)
 
     # remove temp repo configuration file
     if repo_conf_fn: