[yocto] [PATCH 1/3] SingleBranchScheduler: check each repo but not only the first one
Yin Kangkai
kangkai.yin at intel.com
Mon May 19 19:16:55 PDT 2014
Without this patch, when you set a SingleBranchScheduler scheduler,
code will only check against the first repo in repos list. e.g.:
In buildset-config/xxx.conf, I have this:
repos: [{'poky':
{'repourl':'ssh://kyin1@ubi.bj.intel.com:29418/poky',
'bbpriority':'1',
'branch':'galileo'}
},
{'meta-oe':
{'repourl':'git://github.com/openembedded/meta-oe',
'bbpriority':'1',
'branch':'master',
'hash':'13ae5105ee30410136beeae66ec41ee4a8a2e2b0'}
},
...
scheduler: [{'Continuous':
{'type': 'SingleBranchScheduler',
'repository': 'meta-oe',
'stable-timer': 30}
}]
Code will only check 'meta-oe' in scheduler against 'poly', and leads
to a fail. This patch fix this.
Signed-off-by: Yin Kangkai <kangkai.yin at intel.com>
---
lib/python2.7/site-packages/autobuilder/Autobuilder.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/python2.7/site-packages/autobuilder/Autobuilder.py b/lib/python2.7/site-packages/autobuilder/Autobuilder.py
index 4c33489..2a510d4 100644
--- a/lib/python2.7/site-packages/autobuilder/Autobuilder.py
+++ b/lib/python2.7/site-packages/autobuilder/Autobuilder.py
@@ -201,10 +201,12 @@ class Autobuilder:
continue
reponame = value['repository']
- repos = dict(ast.literal_eval(self.configdict[key]['repos'])[0])
- if not repos.has_key(reponame):
- log.msg("No repo %s found" % reponame)
- continue
+ for repos in ast.literal_eval(self.configdict[key]['repos']):
+ if not repos.has_key(reponame):
+ continue
+ else:
+ log.msg("Repo %s found" % reponame)
+ break
repo=repos[reponame]
if not repo.has_key('repourl'):
--
1.8.2.1
More information about the yocto
mailing list