Skip to content

Commit a6afd70

Browse files
rcgoodfellowrcgoodfellow
committed
bump dendrite, use omicron1 zone for tests
1 parent c626d6e commit a6afd70

File tree

11 files changed

+16
-36
lines changed

11 files changed

+16
-36
lines changed

‎.github/buildomat/jobs/build.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#: "/work/debug/*",
99
#: "/work/release/*",
1010
#: ]
11-
#: access_repos = [
12-
#: "oxidecomputer/dendrite",
13-
#: ]
1411
#:
1512
#: [[publish]]
1613
#: series = "release"

‎.github/buildomat/jobs/image.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#: output_rules = [
88
#: "/out/*",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
1310
#:
1411
#: [[publish]]
1512
#: series = "image"

‎.github/buildomat/jobs/linux.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#: "/work/debug/*",
99
#: "/work/release/*",
1010
#: ]
11-
#: access_repos = [
12-
#: "oxidecomputer/dendrite",
13-
#: ]
1411
#:
1512
#: [[publish]]
1613
#: series = "linux"

‎.github/buildomat/jobs/p5p.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
#: "=/out/mg.p5p.sha256",
1010
#: ]
1111
#:
12-
#: access_repos = [
13-
#: "oxidecomputer/dendrite",
14-
#: ]
15-
#:
1612
#: [[publish]]
1713
#: series = "repo"
1814
#: name = "mg.p5p"

‎.github/buildomat/jobs/test-bfd.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#: output_rules = [
88
#: "/work/*.log",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
1310
#:
1411

1512
set -o xtrace

‎.github/buildomat/jobs/test-bgp.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#: output_rules = [
88
#: "/work/*.log",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
1310
#:
1411

1512
set -x

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#: output_rules = [
88
#: "/work/*.log",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
13-
#:
1410

1511
source .github/buildomat/test-ddm-common.sh
1612

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#: output_rules = [
88
#: "/work/*.log",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
13-
#:
1410

1511
source .github/buildomat/test-ddm-common.sh
1612

‎.github/buildomat/jobs/test-rdb.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#: output_rules = [
88
#: "/work/*.log",
99
#: ]
10-
#: access_repos = [
11-
#: "oxidecomputer/dendrite",
12-
#: ]
1310
#:
1411

1512
set -x

‎.github/buildomat/test-ddm-common.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export MAGHEMITE_VERSION=`git rev-parse HEAD`
44
export SOFTNPU_VERSION=591c64bf9765b6ed7cd8615ceb8cf6f8d117bd28
55
export SIDECAR_LITE_VERSION=a95b7a9f78c08125f4e34106f5c885c7e9f2e8d5
6-
export DENDRITE_VERSION=72461d3a6e4724fd33454836d3c9d93c393fd4e4
6+
export DENDRITE_VERSION=eba6b80d7855e0d9a8b17b2d993931d92476b7d5
77

88
function cleanup {
99
pfexec chown -R `id -un`:`id -gn` .
@@ -56,14 +56,17 @@ sed -i "s#<service_fmri value='svc:/oxide/.*setup:default' />##g" \
5656
popd
5757

5858
banner "install"
59-
for p in clang-15 pkg-config brand/sparse ; do
59+
for p in clang-15 pkg-config brand/omicron1 brand/omicron1/tools ; do
6060
set +o errexit
6161
pkg info $p | grep -qi installed
6262
if [[ $? != 0 ]]; then
6363
set -o errexit
6464
pfexec pkg install $p
6565
fi
6666
done
67+
68+
pfexec svcadm enable baseline
69+
sleep 30
6770

6871
set -o errexit
6972
set -o pipefail

0 commit comments

Comments
 (0)