fix localdep issues

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

diff --git a/common/buildservice.py b/common/buildservice.py
index 9a28b68..64377fe 100644 (file)
--- a/common/buildservice.py
+++ b/common/buildservice.py
@@ -1274,7 +1274,7 @@ PRJ_TEMPLATE = """<project name="%(target)s">
   <build>
     <%(build)s/>
   </build>
-  <repository name="standard" linkedbuild="all">
+  <repository name="standard" linkedbuild="localdep">
     <path repository="standard" project="%(src)s"/>
     <arch>i586</arch>
   </repository>

diff --git a/job_repomaker.py b/job_repomaker.py
index 0a91867..ee5e9e4 100755 (executable)
--- a/job_repomaker.py
+++ b/job_repomaker.py
@@ -169,6 +169,7 @@ if __name__ == "__main__":
         sys.exit(-1)
 
     # Pre-release image creation temp project
+    tempbuild = None
     if event_fields["project"].find(":prerelease:") > 0:
         repos_conf = repomaker.RepoConf(server_conf.repos_conf)
         temp_conf_fh, temp_conf_fn = tempfile.mkstemp(text=True)
@@ -180,9 +181,6 @@ if __name__ == "__main__":
         server_conf.repos_conf = temp_conf_fn
         # Disable the project build to save resource
         tempbuild=TempBuildService(temp_repo_define_dict['Project'], OBS_API_URL, PATH_OSCRC)
-        time.sleep(10)
-        assert(tempbuild.is_published())
-        tempbuild.disable_build(OBS_USERNAME)
 
     builds_dir = server_conf.builds
     if not os.path.exists(builds_dir):
@@ -233,3 +231,8 @@ if __name__ == "__main__":
     # remove temp repo configuration file
     if repo_conf_fn:
         os.unlink(repo_conf_fn)
+
+    if tempbuild:
+        tempbuild.disable_build(OBS_USERNAME)
+
+        

diff --git a/repomaker/__init__.py b/repomaker/__init__.py
index f11e99f..f1f517e 100644 (file)
--- a/repomaker/__init__.py
+++ b/repomaker/__init__.py
@@ -813,8 +813,8 @@ class ReviewRepo(RepoManager):
                            }
 
                 # support of 'Sandbox' repos and images for devel prjs
-                if repo['PartOf'] == 'sandbox':
-                    brepo = self._get_repo(repo['SandboxOf'], target)
+                if repo['PartOf'] == 'review':
+                    brepo = self.repos_define.get_repo(repo['SandboxOf'])
                     baserepo = {'prj': brepo['Project'],
                                 'target': brepo['Target'],
                                 'arch': arch,