better matching for refkit ci
v2 cover better matching for refkit ci
Updates since V1:
match the first line and remove the variable name, rather than skipping the first line.
fixes [YOCTO #11720]
Stephano Cetola (1):
ScrapeTargets.py: improve target search algorithm
.../site-packages/autobuilder/buildsteps/ScrapeTargets.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Signature · 1 line
2.13.2
PATCH v2 1/1 ScrapeTargets.py: improve target search algorithm
When scraping the build targets from refkit-ci.inc, grep would only return the first line of the search result. By replacing grep with awk, we are now searching for multi-line variables, and should now scrape build targets even if they have line breaks between them.
[YOCTO #11720]
Signed-off-by Stephano Cetola <[email protected]>
--- .../site-packages/autobuilder/buildsteps/ScrapeTargets.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
lib/python2.7/site-packages/autobuilder/buildsteps/ScrapeTargets.py +4 -5
@@ -41,7 +41,9 @@ class ScrapeTargets(ShellCommand): workerdir = os.path.join(os.path.join(YOCTO_ABBASE, "yocto-worker")) buildername = self.getProperty("buildername") src = os.path.join(workerdir, buildername, "build", self.source) - self.command = "cat " + src + " | grep " + self.targetsvar + # find targetsvar=", skip a line, then return lines up to a quote + self.command = ["awk", + '/%s="/{flag=1;next}/"/{flag=0}flag' % self.targetsvar, src] ShellCommand.start(self) def commandComplete(self, cmd):
@@ -49,10 +51,7 @@ class ScrapeTargets(ShellCommand): return result = cmd.logs['stdio'].getText() - targets = result.replace(self.targetsvar, "") - targets = targets.strip() - targets = targets.replace('=', '') - targets = targets.strip('"') + targets = result.strip() self.setProperty("scraped_targets", targets, 'Targets "%s" scraped from %s' % (targets,
Signature · 1 line
2.13.2