toaster: cummulative 092918 patch
cover toaster: cummulative 092918 patch
From: David Reyna <[email protected]>
Cummulative patches for Toaster:
* 12943: Enable YP-2.6 "Thud", remove "Rocko"
* 12813: Allow captures of error/warning message for command line builds
* 12944: Disable git remote check to allow for firewalls
(Disable this nice-to-have check to allow for firewalls this release, enhance later)
The following changes since commit 3bbbe25ae74e120f7d3452685f0cae2245d7b14d:
glibc-package.inc: correct intention for deleting /usr/lib as needed (2018-09-27 23:41:41 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dreyna/submit/dreyna/toaster/toaster_cummulative_092918
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/submit/dreyna/toaster/toaster_cummulative_092918
David Reyna (3):
toaster: error logs missing for cli builds
toaster: add 'thud' release to Toaster
toaster: disable git remote check to allow for firewalls
lib/bb/ui/buildinfohelper.py | 9 +++++---- lib/toaster/bldcontrol/localhostbecontroller.py | 7 +++++-- lib/toaster/orm/fixtures/oe-core.xml | 12 ++++++------ lib/toaster/orm/fixtures/poky.xml | 10 +++++----- 4 files changed, 21 insertions(+), 17 deletions(-)
Signature · 1 line
1.9.1
PATCH 3/3 toaster: disable git remote check to allow for firewalls
From: David Reyna <[email protected]>
Toaster users behind firewalls that block "git" access usually require developers to add remap rules in their "~/.gitconfig" to remap GIT accesses to HTTP* access. However, there is a "git remote" test in Toaster that is not aware of such remaps, resulting in a false error.
For now, disable this nice-to-have check to support this release, and re-enable when we can add remapping accommodations for this test.
[YOCTO #12944]
--- lib/toaster/bldcontrol/localhostbecontroller.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
lib/toaster/bldcontrol/localhostbecontroller.py +5 -2
@@ -177,8 +177,11 @@ class LocalhostBEController(BuildEnvironmentController): try: localremotes = self._shellcmd("git remote -v", localdirname,env=git_env) - if not giturl in localremotes and commit != 'HEAD': - raise BuildSetupException("Existing git repository at %s, but with different remotes ('%s', expected '%s'). Toaster will not continue out of fear of damaging something." % (localdirname, ", ".join(localremotes.split("\n")), giturl)) + # NOTE: this nice-to-have check breaks when using git remaping to get past firewall + # Re-enable later with .gitconfig remapping checks + #if not giturl in localremotes and commit != 'HEAD': + # raise BuildSetupException("Existing git repository at %s, but with different remotes ('%s', expected '%s'). Toaster will not continue out of fear of damaging something." % (localdirname, ", ".join(localremotes.split("\n")), giturl)) + pass except ShellCmdException: # our localdirname might not be a git repository #- that's fine
Signature · 1 line
1.9.1
PATCH 1/3 toaster: error logs missing for cli builds
In reply to David ReynaFrom: David Reyna <[email protected]>
The method 'store_log_event' in 'buildinfohelper.py' always puts log messages from CLI builds into the backlog but never takes them out. The "close" method now forces all backlogged CLI events to be registered.
[YOCTO #12813]
--- lib/bb/ui/buildinfohelper.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
lib/bb/ui/buildinfohelper.py +5 -4
@@ -1603,14 +1603,14 @@ class BuildInfoHelper(object): mockevent.lineno = -1 self.store_log_event(mockevent) - def store_log_event(self, event): + def store_log_event(self, event,cli_backlog=True): self._ensure_build() if event.levelno < formatter.WARNING: return # early return for CLI builds - if self.brbe is None: + if cli_backlog and self.brbe is None: if not 'backlog' in self.internal_state: self.internal_state['backlog'] = [] self.internal_state['backlog'].append(event)
@@ -1622,7 +1622,7 @@ class BuildInfoHelper(object): tempevent = self.internal_state['backlog'].pop() logger.debug(1, "buildinfohelper: Saving stored event %s " % tempevent) - self.store_log_event(tempevent) + self.store_log_event(tempevent,cli_backlog) else: logger.info("buildinfohelper: All events saved") del self.internal_state['backlog']
@@ -1987,7 +1987,8 @@ class BuildInfoHelper(object): if 'backlog' in self.internal_state: # we save missed events in the database for the current build tempevent = self.internal_state['backlog'].pop() - self.store_log_event(tempevent) + # Do not skip command line build events + self.store_log_event(tempevent,False) if not connection.features.autocommits_when_autocommit_is_off: transaction.set_autocommit(True)
Signature · 1 line
1.9.1
PATCH 2/3 toaster: add 'thud' release to Toaster
In reply to David ReynaFrom: David Reyna <[email protected]>
Toaster needs to include new YP-2.6 "Thud" release.
[YOCTO #12943]
--- lib/toaster/orm/fixtures/oe-core.xml | 12 ++++++------ lib/toaster/orm/fixtures/poky.xml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
lib/toaster/orm/fixtures/oe-core.xml +6 -6
@@ -23,14 +23,14 @@ <field type="CharField" name="branch">master</field> </object> <object model="orm.bitbakeversion" pk="4"> - <field type="CharField" name="name">rocko</field> + <field type="CharField" name="name">thud</field> <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> - <field type="CharField" name="branch">1.36</field> + <field type="CharField" name="branch">1.40</field> </object> <!-- Releases available --> <object model="orm.release" pk="1"> - <field type="CharField" name="name">rocko</field> + <field type="CharField" name="name">sumo</field> <field type="CharField" name="description">Openembedded Sumo</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> <field type="CharField" name="branch_name">sumo</field>
@@ -51,11 +51,11 @@ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> </object> <object model="orm.release" pk="4"> - <field type="CharField" name="name">rocko</field> + <field type="CharField" name="name">thud</field> <field type="CharField" name="description">Openembedded Rocko</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> - <field type="CharField" name="branch_name">rocko</field> - <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=rocko\">OpenEmbedded Rocko</a> branch.</field> + <field type="CharField" name="branch_name">thud</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=thud\">OpenEmbedded Thud</a> branch.</field> </object> <!-- Default layers for each release -->
lib/toaster/orm/fixtures/poky.xml +5 -5
@@ -26,9 +26,9 @@ <field type="CharField" name="dirpath">bitbake</field> </object> <object model="orm.bitbakeversion" pk="4"> - <field type="CharField" name="name">rocko</field> + <field type="CharField" name="name">thud</field> <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> - <field type="CharField" name="branch">rocko</field> + <field type="CharField" name="branch">thud</field> <field type="CharField" name="dirpath">bitbake</field> </object>
@@ -57,10 +57,10 @@ </object> <object model="orm.release" pk="4"> <field type="CharField" name="name">rocko</field> - <field type="CharField" name="description">Yocto Project 2.4 "Rocko"</field> + <field type="CharField" name="description">Yocto Project 2.6 "Thud"</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> - <field type="CharField" name="branch_name">rocko</field> - <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=rocko">Yocto Project Rocko branch</a>.</field> + <field type="CharField" name="branch_name">thud</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=thud">Yocto Project Thud branch</a>.</field> </object> <!-- Default project layers for each release -->
Signature · 1 line
1.9.1