rename triggerbuild to buildtrigger, fix bugs

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

diff --git a/job_imager.py b/job_imager.py
index fb13ad8..cef6f71 100755 (executable)
--- a/job_imager.py
+++ b/job_imager.py
@@ -18,7 +18,7 @@ except ImportError:
     import simplejson as json
 
 from common.envparas import export
-from common.triggerbuild import read_from
+from common.buildtrigger import trigger_info
 
 P_NAME = 'imager' # component name in boss
 
@@ -41,7 +41,7 @@ HOSTNAME = os.uname()[1]
 PARAM_LIST = {
         'TASK_DIRECTORY',
         'DESTINATION_DIRECTORY',
-        'CONTENT',
+        'TRIGGER_INFO',
         'REDIS_SERVER'
     }
 
@@ -83,7 +83,7 @@ def _change_url(ksc, conf_baseurl, relative_uri):
 def main():
 
     
-    fields = read_from(CONTENT)
+    fields = trigger_info(TRIGGER_INFO)
 
     # 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 2efdb3e..ca1e2de 100755 (executable)
--- a/job_repomaker.py
+++ b/job_repomaker.py
@@ -15,7 +15,7 @@ except ImportError:
 
 from common.envparas import export
 from common.buildservice import BuildService, TempBuildService
-from common.triggerbuild import read_from, write_to
+from common.buildtrigger import trigger_info, trigger_next
 import repomaker
 import base64
 import time
@@ -46,7 +46,7 @@ PARAM_LIST = ['PATH_BUILDS',
               'MAILTO',
               'SANDBOX_REPO_BASEURL',
               'EMAIL_TEMPLATES_DIR',
-              'CONTENT',
+              'TRIGGER_INFO',
               'BUILD_TAG',
               'RSYNC_SERVER',
               'IMAGE_INFO',
@@ -159,7 +159,7 @@ if __name__ == "__main__":
 
     repo_conf_fn = None
 
-    event_fields = read_from(CONTENT)
+    event_fields = trigger_info(TRIGGER_INFO)
     
     if not event_fields:
         print "Invalid OBS event: %s" %(OBS_EVENT_STRING)
@@ -223,7 +223,7 @@ if __name__ == "__main__":
         image_info = image_dispatch(repoinfo)
         if image_info:
             for index, imagerinfo in enumerate(image_info):
-                write_to('image_trigger_%s.env' %(index), imagerinfo)
+                trigger_next('image_trigger_%s' %(index), imagerinfo)
 
     # remove temp repo configuration file
     if repo_conf_fn:

diff --git a/job_reviewrepo_cleanup.py b/job_reviewrepo_cleanup.py
index 003a76b..375a180 100755 (executable)
--- a/job_reviewrepo_cleanup.py
+++ b/job_reviewrepo_cleanup.py
@@ -35,7 +35,7 @@ GIT_URL = 'ssh://%s@%s:%s' % (GERRIT_USERNAME, GERRIT_HOSTNAME, GERRIT_SSHPORT)
 def search_published_repo(repo_path_base, project,  sr_id):
 
     reviewrepo_base = os.path.join(repo_path_base,'pre-release', project)
-    if os.path.isdir(repo_path_base):
+    if os.path.isdir(reviewrepo_base):
         for dir_name in os.listdir(reviewrepo_base):
             if dir_name.endswith("sr.%s" %sr_id):
                 return os.path.join(reviewrepo_base, dir_name)