upgrade gbs related command to fit gbs 0.12

Change-Id: I3837555be41981674ba44e8a7e818a781ac0aba2
Signed-off-by: Lin Yang <lin.a.yang@intel.com>

diff --git a/common/tempbuildpkg.py b/common/tempbuildpkg.py
index 1623626..795a2ca 100644 (file)
--- a/common/tempbuildpkg.py
+++ b/common/tempbuildpkg.py
@@ -16,15 +16,14 @@ class TempPackageBuild:
         else:
             self.package = package
 
-    def remote_build(self, dest_project, git_project, message = ''):
+    def remote_build(self, dest_project, git_project, spec, packagingdir, message = ''):
         """ Use gbs remotebuild to send local git tree to OBS as obs package """
         if not self.bs.getTargets(dest_project):
             print '\n----------\nOBS %s project do not have repo setting, quit build check against to it\n----------' % dest_project
             return 'NoRepo'
         with open('%s/packaging/git_info' % git_project, 'w') as fh:
             fh.write(message)
-        print "Call gbs command: ", "gbs -v rb --include-all -B %s -T %s %s" %(dest_project, self.project, git_project)
-        runner.show("gbs -v rb --include-all -B %s -T %s %s" %(dest_project, self.project, git_project))
+        runner.show("gbs -v rb --include-all -B %s -T %s --spec %s --packaging-dir %s %s" %(dest_project, self.project, spec, packagingdir, git_project))
         os.remove("%s/packaging/git_info" % git_project)
 
     def wait_build_finish(self):

diff --git a/job_policycheck.py b/job_policycheck.py
index 2115991..9befe36 100755 (executable)
--- a/job_policycheck.py
+++ b/job_policycheck.py
@@ -150,7 +150,7 @@ if __name__ == '__main__':
             # submit this change to OBS for build check
             print 'submit this change to OBS for build check...'
             temp_build = TempPackageBuild(OBS_API_URL, OBS_OSCRC_PATH, buildcheck_project, spec.name)
-            if 'NoRepo' == temp_build.remote_build(obs_dest_prj, prjdir, 'GIT_PROJECT: %s\nCOMMIT_ID: %s\nOWNER_EMAIL: %s' % (GERRIT_PROJECT, GERRIT_PATCHSET_REVISION, GERRIT_CHANGE_OWNER_EMAIL)):
+            if 'NoRepo' == temp_build.remote_build(obs_dest_prj, prjdir, os.path.basename(specfile), packagingdir, 'GIT_PROJECT: %s\nCOMMIT_ID: %s\nOWNER_EMAIL: %s' % (GERRIT_PROJECT, GERRIT_PATCHSET_REVISION, GERRIT_CHANGE_OWNER_EMAIL)):
                 msg = "[BUILD CHECK RESULT] Can not test build against to project %s, which currently has no build targets defined. Please contact the build system administrator." %(obs_dest_prj)
                 mygerrit.review(commit = GERRIT_PATCHSET_REVISION, message = msg)
         except Exception, err:

diff --git a/job_submitobs.py b/job_submitobs.py
index 11fab21..d3696c1 100755 (executable)
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -406,7 +406,7 @@ def main():
             # use gbs export to generate tarball
             outdir = tempfile.mkdtemp(prefix=tmpdir+'/')
             with utils.Workdir(prjdir):
-                runner.show('gbs export --spec=%s -o %s' % (specfile, outdir))
+                runner.show('gbs export --spec %s --packaging-dir %s -o %s' % (os.path.basename(specfile), packagingdir, outdir))
         except Exception, exc:
             print('gbp parse spec failed. %s' % exc)
             msg = "The tag %s pushed, but backend service parsed %s failed. Please make sure (gbs export) can work in this project." % (tag, os.path.basename(specfile))