Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buildbot: OpenWrt 24.10, and combined profiles.json for autoupdater #135

Merged
merged 3 commits into from
Nov 5, 2024
Merged
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
2 changes: 0 additions & 2 deletions roles/buildbot/files/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ c['www']['ui_default_config'] = {
'Builders.page_size': 500,
'Build.trigger_step_page_size': 100,
'BuildRequests.buildrequestFetchLimit': 100,
'Home.max_recent_builds': 1, # broken?
'Home.max_recent_builders': 3, # broken?
}

c['change_source'] = []
Expand Down
1 change: 1 addition & 0 deletions roles/buildbot/files/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def archTriggerStep(arch):
def branchToFalterBranch(props):
o2f = {
"main": "snapshot",
"openwrt-24.10": "1.5.0-snapshot",
"openwrt-23.05": "1.4.0-snapshot",
"openwrt-22.03": "1.3.0-snapshot",
"openwrt-21.02": "1.2.3-snapshot",
Expand Down
7 changes: 6 additions & 1 deletion roles/buildbot/files/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ def targetsFalterBranch(props):
return "1.3.0-snapshot"
elif fv.startswith("1.4.0"):
return "1.4.0-snapshot"
elif fv.startswith("1.5.0"):
return "1.5.0-snapshot"
else:
return "snapshot"

Expand Down Expand Up @@ -246,6 +248,7 @@ def targetsFactory(f, wwwPrefix):
"%(kw:prefix)s/builds/targets/%(prop:buildnumber)s", prefix=wwwPrefix
)
pubdir = util.Interpolate("%(kw:pr)s/%(kw:pd)s", pr=wwwPrefix, pd=targetsPubDir)

f.addStep(
steps.MasterShellCommand(
name="publish",
Expand Down Expand Up @@ -279,7 +282,9 @@ def targetsFactory(f, wwwPrefix):
# since we want to be able to just delete that at any time,
# without worrying about symlinks pointing to deleted stuff.
"""\
mkdir -p %(kw:p)s %(kw:p)s.new \
cat %(kw:w)s/tunneldigger/*/*/profiles.json | jq -s . > %(kw:w)s/tunneldigger/profiles.json \
&& cat %(kw:w)s/notunnel/*/*/profiles.json | jq -s . > %(kw:w)s/notunnel/profiles.json \
&& mkdir -p %(kw:p)s %(kw:p)s.new \
&& rm -rf %(kw:p)s.new/* %(kw:p)s.prev \
&& mv %(kw:w)s/* %(kw:p)s.new/ \
&& mv %(kw:p)s %(kw:p)s.prev \
Expand Down