Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions core/tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@ def run(self) -> None:

def load_tests(self, name):
core.log_open_sec(name.capitalize() + " tests")
tests_subdir = os.path.join(self.config.get('dirs', 'tests'), name)
# tests_subdir = os.path.join(self.config.get('dirs', 'tests'), name)
tests = []
for td in os.listdir(tests_subdir):
test = f'{name}/{td}'
if test not in self.exclude and (len(self.include) == 0 or test in self.include):
core.log(f"Adding test {test}")
tests.append(Test(os.path.join(tests_subdir, td), td))
else:
core.log(f"Skipped test {test}")
core.log_end_sec()
# for td in os.listdir(tests_subdir):
# test = f'{name}/{td}'
# if test not in self.exclude and (len(self.include) == 0 or test in self.include):
# core.log(f"Adding test {test}")
# tests.append(Test(os.path.join(tests_subdir, td), td))
# else:
# core.log(f"Skipped test {test}")
# core.log_end_sec()

return tests

Expand Down
17 changes: 17 additions & 0 deletions core/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,23 @@ def check_applies_with_depends(self, thing):

return ret

def push_tree(self, series_id, patch_ids):
try:
if not patch_ids:
print(f"{series_id} has no patches")
return

patch_ids.reverse()
for id in patch_ids:
name = f"{id}->{self.name}"
self.git(["checkout", "-B", name])
self.git(["push", "github", name])
print(f"pushed {name} to git**b")
self.git(["checkout", "HEAD~1"])

except CMD.CmdError as e:
raise PatchApplyError(e) from e

def _pull_safe(self, pull_url):
try:
self.git_pull(pull_url)
Expand Down
3 changes: 3 additions & 0 deletions pw/pw_series.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def __init__(self, pw, pw_series):
self.pw_series = pw_series
# pull_url loaded from patch 0, not from cover; it's for pure pulls only
self.pull_url = None
self.patch_ids = []

if pw_series['cover_letter']:
pw_cover_letter = pw.get_mbox('cover', pw_series['cover_letter']['id'])
Expand All @@ -37,6 +38,7 @@ def __init__(self, pw, pw_series):
for p in self.pw_series['patches']:
raw_patch = pw.get_mbox('patch', p['id'])
self.patches.append(Patch(raw_patch, p['id']))
self.patch_ids.append(p['id'])
return

# Do more magic around series which are complete
Expand Down Expand Up @@ -73,6 +75,7 @@ def __init__(self, pw, pw_series):
for pid in pids:
raw_patch = pw.get_mbox('patch', pid)
self.patches.append(Patch(raw_patch, pid))
self.patch_ids.append(pid)

if not pw_series['cover_letter']:
if len(self.patches) == 1:
Expand Down
21 changes: 20 additions & 1 deletion pw_poller.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def _series_determine_tree(self, s: PwSeries) -> str:
elif "master" in self._trees and self._trees["master"].check_applies(s):
s.tree_name = "master"

self.series_push_github(s)

if hasattr(s, 'tree_name') and s.tree_name:
log(f"Target tree - {s.tree_name}", "")
res = f"Guessed tree name to be {s.tree_name}"
Expand All @@ -135,6 +137,21 @@ def series_determine_tree(self, s: PwSeries) -> str:

return ret

def series_push_github(self, s: PwSeries):
log_open_sec('Pushing the tree')

patch_ids = list()

for patch in s['patches']:
patch_ids.append(patch['id'])

try:
if hasattr(s, 'tree_name') and s.tree_name and patch_ids:
print(f"{patch_ids}")
self._trees[s.tree_name].push_tree(s.id, patch_ids)
finally:
log_end_sec()

def _process_series(self, pw_series) -> None:
if pw_series['id'] in self.seen_series:
log(f"Already seen {pw_series['id']}", "")
Expand All @@ -157,7 +174,9 @@ def _process_series(self, pw_series) -> None:

if hasattr(s, 'tree_name') and s.tree_name:
s.tree_selection_comment = comment
self._workers[s.tree_name].queue.put(s)
#self._workers[s.tree_name].queue.put(s)
core.write_tree_selection_result(self.result_dir, s, comment, False)
core.mark_done(self.result_dir, s)
else:
core.write_tree_selection_result(self.result_dir, s, comment, False)
core.mark_done(self.result_dir, s)
Expand Down
73 changes: 0 additions & 73 deletions tests/patch/build_32bit/build_32bit.sh

This file was deleted.

4 changes: 0 additions & 4 deletions tests/patch/build_32bit/info.json

This file was deleted.

73 changes: 0 additions & 73 deletions tests/patch/build_allmodconfig_warn/build_allmodconfig.sh

This file was deleted.

4 changes: 0 additions & 4 deletions tests/patch/build_allmodconfig_warn/info.json

This file was deleted.

73 changes: 0 additions & 73 deletions tests/patch/build_clang/build_clang.sh

This file was deleted.

4 changes: 0 additions & 4 deletions tests/patch/build_clang/info.json

This file was deleted.

4 changes: 0 additions & 4 deletions tests/patch/cc_maintainers/info.json

This file was deleted.

Loading