Skip to content

Commit 34b34f5

Browse files
committed
ci: fix tests and slightly improve build times.
* Vendor the latest omicron config to fix tests. * Speed up the cleanup step by a few minutes.
1 parent a2279ca commit 34b34f5

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/build-test.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,19 @@ jobs:
3636
# hosted Github Actions runners don't offer much space. Clean up unused
3737
# dependencies so that we don't run out of disk. Borrowed from
3838
# https://carlosbecker.com/posts/github-actions-disk-space.
39+
#
40+
# Note: deleting these directories can be very slow, so we only remove
41+
# enough to allow the build to complete. We'll drop this workaround and
42+
# get better build times once we switch to self-hosted runners with
43+
# persistent storage and more disk.
3944
- name: "cleanup"
4045
run: |
41-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
46+
time du -sh /usr/share/dotnet
47+
time du -sh /opt/hostedtoolcache/CodeQL
48+
49+
time sudo rm -rf /usr/share/dotnet
50+
time sudo rm -rf /opt/hostedtoolcache/CodeQL
51+
4252
sudo docker image prune --all --force
4353
sudo docker builder prune -a
4454
- uses: actions/checkout@v5

acctest/nexus-config.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,16 @@ metrics_producer_gc.period_secs = 60
9898
external_endpoints.period_secs = 60
9999
nat_cleanup.period_secs = 30
100100
bfd_manager.period_secs = 30
101+
# How frequently to check for a new inventory collection (made by any Nexus).
102+
# This is cheap, so we should check frequently.
103+
inventory.period_secs_load = 15
101104
# How frequently to collect hardware/software inventory from the whole system
102105
# (even if we don't have reason to believe anything has changed).
103-
inventory.period_secs = 600
106+
inventory.period_secs_collect = 600
104107
# Maximum number of past collections to keep in the database
105108
inventory.nkeep = 5
106109
# Disable inventory collection altogether (for emergencies)
107-
inventory.disable = false
110+
inventory.disable_collect = false
108111
phantom_disks.period_secs = 30
109112
physical_disk_adoption.period_secs = 30
110113
support_bundle_collector.period_secs = 30

0 commit comments

Comments
 (0)