Fix: Ignore patchinfo, Trigger for build check

1. Discard patchinfo package which should not be present when creating reference project.
2. Importing rpms on backend server runs as obsservicerun.
   That user have no write permission in ${JENKINS_WORKSPACE} path.

Change-Id: I2250fea8cfb247133fc80b70f06269308b86eb18

diff --git a/job_ref_create_prj_obs.py b/job_ref_create_prj_obs.py
index b7848cf..4914b02 100644 (file)
--- a/job_ref_create_prj_obs.py
+++ b/job_ref_create_prj_obs.py
@@ -526,6 +526,9 @@ class ref_create_project_obs(object):
         config = remote_build.get_project_config(profile)
         remote_package_list = [ p for p in remote_build.get_sourceinfo_list(profile) ]
         print '\nGet Package List from Remote Done at %s' % (str(datetime.now()))
+        if 'patchinfo' in remote_package_list:
+            remote_package_list.remove('patchinfo')
+            print 'Please check patchinfo'
 
         print "\n    0-1) copy package list (%d):\n %s" %(len(remote_package_list), remote_package_list)
         if not build.exists(target):

diff --git a/job_ref_import_rpm_obs.py b/job_ref_import_rpm_obs.py
index 3fe3f18..42d7de1 100644 (file)
--- a/job_ref_import_rpm_obs.py
+++ b/job_ref_import_rpm_obs.py
@@ -300,9 +300,6 @@ class ref_import_rpm_obs(object):
         print('-----[JOB STARTED: importrpm_for_obs  ]-----')
         self.run_ref_import_rpm_obs(action[1] if len(action) == 2 else None)
 
-        # check obs sanity build with this ref project
-        trigger_next("REF_PRECHECK_BUILD", {'project': self.profile['refprj']})
-
 if __name__ == '__main__':
     try:
         trigger = ref_import_rpm_obs()

diff --git a/job_ref_precheck_project_obs.py b/job_ref_precheck_project_obs.py
index 19ae3af..8ce04d1 100644 (file)
--- a/job_ref_precheck_project_obs.py
+++ b/job_ref_precheck_project_obs.py
@@ -38,7 +38,7 @@ class LocalError(Exception):
 
 def main():
 
-    ref_project = trigger_info(os.getenv('TRIGGER_INFO'))['project']
+    ref_project = trigger_info(os.getenv('TRIGGER_INFO'))['target']
     target_project = 'home:devel:Build:%s' % ref_project
     package_to_build = 'appcore-widget'
     if ':Base:ref:' in ref_project: