Fix several issues

1. Use simple mete conf when disable project build
2. Remove the multi temporary repoes when SR closed
3. Fix bugs when adaptor to new trigger method

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

diff --git a/common/buildservice.py b/common/buildservice.py
index db5e7cb..9a28b68 100644 (file)
--- a/common/buildservice.py
+++ b/common/buildservice.py
@@ -1289,6 +1289,9 @@ class TempBuildService():
     def get_repostatus(self):
         return self.bs.getRepoState(self.project)
 
+    def cleanup(self):
+        return self.bs.deleteProject(self.project)
+
     def is_published(self):
         try:
             return set(self.get_repostatus().values()) == set(['published'])
@@ -1332,17 +1335,26 @@ class TempBuildService():
         if not found:
             print "did not find any image configurations"
 
-    def disable_build(self, src, user):
-        targetmeta = PRJ_TEMPLATE % {'target': self.project, 'src': src,
-                                     'user': user, 'build': 'disable'}
+    def disable_build(self, user):
+
+        targetmeta = """<project name="%(target)s">
+  <title></title>
+  <description></description>
+  <person role="maintainer" userid="%(user)s"/>
+  <person role="bugowner" userid="%(user)s"/>
+  <build>
+    <%(build)s/>
+  </build>
+</project>"""% {'target': self.project, 'user': user, 'build': 'disable'}
         print targetmeta
         fileh, filename = tempfile.mkstemp(prefix="osc_metafile.",
                                            suffix=".xml", text=True)
         os.write(fileh, targetmeta)
         os.close(fileh)
-        os.system("osc meta prj %s -F %s" %(self.project, filename))
+        os.system("osc -d -v meta prj %s -F %s" %(self.project, filename))
+        sys.stdout.flush()
         os.unlink(filename)
-
+        
     def link_project(self, src, user):
         targetmeta = PRJ_TEMPLATE % {'target': self.project, 'src': src,
                                      'user': user, 'build': 'enable'}

diff --git a/job_pre_release.py b/job_pre_release.py
index 7ac1225..be67d17 100755 (executable)
--- a/job_pre_release.py
+++ b/job_pre_release.py
@@ -8,6 +8,7 @@ from common.envparas import export
 from common import utils
 from common import git
 from common import buildservice
+from common.buildtrigger import trigger_info
 import os
 import tempfile
 import time
@@ -15,16 +16,9 @@ import sys
 
 envparas = ['JENKINS_HOME',
             'WORKSPACE',
-            'GIT_PROJECT',
-            'GIT_TAG',
-            'OBS_REQ_PRJ_SRC',
-            'OBS_REQ_PRJ',
-            'OBS_REQ_PKG',
-            'OBS_REQ_ID',
+            'TRIGGER_INFO',
             'OBS_API_URL',
             'OBS_OSCRC_PATH',
-            'COMMITID',
-            'OBS_REQ_WHO',
             'GERRIT_HOSTNAME',
             'GERRIT_USERNAME',
             'GERRIT_SSHPORT',
@@ -38,6 +32,8 @@ if __name__ == '__main__':
 
     print '---[JOB STARTED]----------------------------------------'
 
+    locals().update(trigger_info(TRIGGER_INFO))
+
     # update local git tree from remote
     try:
         if os.path.exists(os.path.join(GIT_CACHE_DIR, GIT_PROJECT)):

diff --git a/job_repomaker.py b/job_repomaker.py
index ca1e2de..a7c1217 100755 (executable)
--- a/job_repomaker.py
+++ b/job_repomaker.py
@@ -134,7 +134,7 @@ def temp_repo_define(event_files, repos_conf):
         "target": repo,
         "release": "sr.%s" %sr_id,
         "arch":["ia32"],
-        "reporequire": ["Tizen:2.0:Base"]       #FIXME
+        "reporequire": ["Tizen:Base"]       #FIXME
         }
 
     print "====LOG:REPO_MAKER:TEMP_CONF===="
@@ -144,6 +144,9 @@ def temp_repo_define(event_files, repos_conf):
 
 if __name__ == "__main__":
 
+    print '---[JOB STARTED]----------------------------------------'
+    sys.stdout.flush()
+
     server_conf = ServerConf()
     server_conf.raw_repos = PATH_RAW_REPOS
     server_conf.repos_conf = PATH_REPO_CONF
@@ -179,7 +182,7 @@ if __name__ == "__main__":
         tempbuild=TempBuildService(temp_repo_define_dict['Project'], OBS_API_URL, PATH_OSCRC)
         time.sleep(10)
         assert(tempbuild.is_published())
-        tempbuild.disable_build(temp_repo_define_dict['SandboxOf'], OBS_USERNAME)
+        tempbuild.disable_build(OBS_USERNAME)
 
     builds_dir = server_conf.builds
     if not os.path.exists(builds_dir):

diff --git a/job_reviewrepo_cleanup.py b/job_reviewrepo_cleanup.py
index 375a180..a87289a 100755 (executable)
--- a/job_reviewrepo_cleanup.py
+++ b/job_reviewrepo_cleanup.py
@@ -5,23 +5,17 @@
 """
 
 from common.envparas import export
-from common.buildservice import BuildService
+from common.buildservice import TempBuildService
+from common.buildtrigger import trigger_info
 import os
 
 envparas = ['JENKINS_HOME',
             'WORKSPACE',
-            'GIT_PROJECT',
-            'GIT_TAG',
-            'OBS_REQ_PRJ_SRC',
-            'OBS_REQ_PRJ',
-            'OBS_REQ_PKG',
-            'OBS_REQ_ID',
+            'TRIGGER_INFO',
             'OBS_API_URL',
             'PATH_BUILDS',
             'PATH_OSCRC',
             'OBS_OSCRC_PATH',
-            'COMMITID',
-            'OBS_REQ_WHO',
             'GERRIT_HOSTNAME',
             'GERRIT_USERNAME',
             'GERRIT_SSHPORT',
@@ -29,32 +23,42 @@ envparas = ['JENKINS_HOME',
 
 export(envparas, locals())
 
-GIT_URL = 'ssh://%s@%s:%s' % (GERRIT_USERNAME, GERRIT_HOSTNAME, GERRIT_SSHPORT)
-
-
 def search_published_repo(repo_path_base, project,  sr_id):
-
+    """ Search publised repository, which releated with this sr
+    return is a list.
+    """
+    ret_list = []
     reviewrepo_base = os.path.join(repo_path_base,'pre-release', project)
     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)
-    else:
-        print "WARN: reviewrepo %s doesn't exist" %reviewrepo_base
+                ret_list.append(os.path.join(reviewrepo_base, dir_name))
+    
+    return ret_list
 
 if __name__ == '__main__':
 
     print '---[JOB STARTED]----------------------------------------'
-
+    sys.stdout.flush()
+    
+    locals().update(trigger_info(TRIGGER_INFO))
 
     obs_project = "%s:prerelease:%s:%s" %( OBS_REQ_PRJ, OBS_REQ_ID, OBS_REQ_PKG)
-    bs = BuildService(OBS_API_URL, PATH_OSCRC)
-    bs.deleteProject(obs_project)
+    bs = TempBuildService(obs_project, OBS_API_URL, PATH_OSCRC)
+    bs.cleanup()
     print "OBS Project %s  deleted" %obs_project
+    # Try again # FIX ME
+    os.system("osc -d -c /etc/repos/oscrc rdelete %s -m 'deleted'" %obs_project)
 
-    reviewrepo_path = search_published_repo(PATH_BUILDS, OBS_REQ_PKG, OBS_REQ_ID)
-    if reviewrepo_path:
-        print "Removing temporary repo: %s" %reviewrepo_path
-        os.system("rm -rf %s" %reviewrepo_path)
+    reviewrepo_paths = search_published_repo(PATH_BUILDS, OBS_REQ_PKG, OBS_REQ_ID)
+    if reviewrepo_paths:
+        for repodir in reviewrepo_paths:
+            print "Removing temporary repo: %s" %repodir
+            os.system("rm -rf %s" %repodir)
+        # Remove the parent dir if empty
+        parent_dir = os.path.abspath('%s/../../%s' %(reviewrepo_paths[0], OBS_REQ_PKG))
+        if not os.listdir(parent_dir):
+            os.system("rm -r %s" %parent_dir)
+            print "Removing temporary repo parent: %s" %parent_dir
     else:
-        print "WARN: Temporary %s has been removed" %reviewrepo_path
+        print "WARN: Temporary repo doesn't exist!"