Skip to content

Commit 4b2eed7

Browse files
merge main
2 parents e49df46 + 8490d99 commit 4b2eed7

19 files changed

Lines changed: 1436 additions & 422 deletions

File tree

.github/buildomat/jobs/falcon-lab.sh

100644100755
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,8 @@ gw=$(bmat address ls -f extra -Ho gateway)
5353
server=$(ipadm show-addr "$EXT_INTERFACE"/dhcp -po ADDR | sed 's#/.*##g')
5454
pfexec ./dhcp-server "$first" "$last" "$gw" "$server" &> /work/dhcp-server.log &
5555

56-
# workaround for https://www.illumos.org/issues/17853
57-
# create a dummy0 vnic that persists beyond shutdown of falcon topology to avoid
58-
# the final vnic removal triggering a panic
59-
if ! error=$(pfexec dladm create-vnic -l $EXT_INTERFACE dummy0 2>&1); then
60-
if [[ "$error" == *"object already exists"* ]]; then
61-
echo "VNIC already exists, continuing..."
62-
else
63-
echo "Unexpected error: $error" >&2
64-
exit 1
65-
fi
66-
fi
67-
6856
RUST_LOG=debug pfexec ./falcon-lab run \
6957
trio-unnumbered
58+
59+
RUST_LOG=debug pfexec ./falcon-lab run \
60+
trio-bfd-static-routing

.github/buildomat/jobs/test-ddm.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
#:
3+
#: name = "test-ddm"
4+
#: variety = "basic"
5+
#: target = "helios-2.0"
6+
#: rust_toolchain = "stable"
7+
#: output_rules = [
8+
#: "/work/*.log",
9+
#: "/tmp/*.db",
10+
#: ]
11+
#:
12+
13+
set -o xtrace
14+
set -o errexit
15+
set -o pipefail
16+
17+
source .github/buildomat/test-common.sh
18+
banner ddm
19+
cargo nextest run -p ddm --nocapture

0 commit comments

Comments
 (0)