summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Pollard <tom.pollard@codethink.co.uk>2019-11-28 16:57:18 +0000
committerTom Pollard <tom.pollard@codethink.co.uk>2019-11-28 16:57:18 +0000
commita49ea0cc4ab82bc118becee980943e2b38bd687a (patch)
treef9d05343b52cbd1e710451f57cba1c4ace1a2c43
parentc9fa38caa158643e1a2b26de00006e6901aa2392 (diff)
downloadbuildstream-tpollard/subrebase.tar.gz
Revert "Explicitly ensure failed build sources are not pushed"tpollard/subrebase
This reverts commit 9abdc2bbfd87ed9662659946829d79c3bc7bb7e3.
-rw-r--r--src/buildstream/element.py3
-rw-r--r--tests/sourcecache/push.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index d422d5fa0..6918c9cb0 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -1846,8 +1846,7 @@ class Element(Plugin):
return True
def _skip_source_push(self):
- # Skip push if we have no sources, are workspaced or the given element failed to build
- if not self.__sources or self._get_workspace() or not self._get_build_result()[0]:
+ if not self.__sources or self._get_workspace():
return True
return not (self.__sourcecache.has_push_remotes(plugin=self) and self._source_cached())
diff --git a/tests/sourcecache/push.py b/tests/sourcecache/push.py
index 551593e18..719860425 100644
--- a/tests/sourcecache/push.py
+++ b/tests/sourcecache/push.py
@@ -254,5 +254,5 @@ def test_source_push_build_fail(cli, tmpdir, datafiles):
res.assert_task_error(ErrorDomain.ELEMENT, None)
# Sources are not pushed as the build queue is before the source push
- # queue. We explicitly don't want to push failed build source by default.
+ # queue.
assert "Pushed source " not in res.stderr