get project name from OBS event content, fix an import error

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

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index d5a8c2b..7f8e5a2 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -16,7 +16,7 @@ from testprojects.prerelease import PreRelease2
 from testprojects.prerelease import get_prerelease_project_name
 from common.buildservice import BuildService
 
-from gitbuildsys import BuildData, BuildDataError
+from gitbuildsys.builddata import BuildData, BuildDataError
 
 class LocalError(Exception):
     """Local error exception."""
@@ -120,15 +120,16 @@ def main(name, action):
     obs_target_prj = content.get('OBS_REQ_PRJ')
     git_tag = content.get("GIT_TAG")
 
-    project = get_prerelease_project_name(obs_target_prj, obs_user, git_tag)
     build = BuildService(obs_api, obs_user, obs_passwd)
 
     if action == 'create_images':
+        project = content.get("project")
         gen_builddata(build, project)
         projectbuild = ProjectBuildService(project, obs_api, obs_user, obs_passwd)
         prerelease = PreRelease2(project, projectbuild)
         create_images(prerelease)
     elif action == 'cleanup':
+        project = get_prerelease_project_name(obs_target_prj, obs_user, git_tag)
         build.cleanup(project, "Cleaned up by %s" % name)
     else:
         print "Not supported method of Pre-release jobs:", action