Skip to content

Commit 5747999

Browse files
authored
Bump dendrite (#458)
1 parent 5a0d6ed commit 5747999

File tree

18 files changed

+79
-184
lines changed

18 files changed

+79
-184
lines changed

.github/buildomat/jobs/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#: "/work/release/*",
1010
#: ]
1111
#: access_repos = [
12-
#: "oxidecomputer/dendrite-os",
12+
#: "oxidecomputer/dendrite",
1313
#: ]
1414
#:
1515
#: [[publish]]

.github/buildomat/jobs/image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/out/*",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414
#: [[publish]]

.github/buildomat/jobs/linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#: "/work/release/*",
1010
#: ]
1111
#: access_repos = [
12-
#: "oxidecomputer/dendrite-os",
12+
#: "oxidecomputer/dendrite",
1313
#: ]
1414
#:
1515
#: [[publish]]

.github/buildomat/jobs/p5p.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#: ]
1111
#:
1212
#: access_repos = [
13-
#: "oxidecomputer/dendrite-os",
13+
#: "oxidecomputer/dendrite",
1414
#: ]
1515
#:
1616
#: [[publish]]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/work/*.log",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/work/*.log",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/work/*.log",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/work/*.log",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#: "/work/*.log",
99
#: ]
1010
#: access_repos = [
11-
#: "oxidecomputer/dendrite-os",
11+
#: "oxidecomputer/dendrite",
1212
#: ]
1313
#:
1414

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ banner "collect"
3232
get_artifact softnpu image 64beaff129b7f63a04a53dd5ed0ec09f012f5756 softnpu
3333
get_artifact sidecar-lite release d815d8e2b310de8a7461241d9f9f1b5c762e1e65 libsidecar_lite.so
3434
get_artifact sidecar-lite release d815d8e2b310de8a7461241d9f9f1b5c762e1e65 scadm
35-
get_artifact dendrite image 350fb25d724578dd2b127499edcd57981d4bbff2 dendrite-softnpu.tar.gz
35+
get_artifact dendrite image 270dc8eb421b8514bf1ed00ab956025dc326b9df dendrite-softnpu.tar.gz
3636
get_artifact maghemite release 2bfd39000c878c45675651a7588c015c486e7f43 ddmd
3737
get_artifact maghemite release 2bfd39000c878c45675651a7588c015c486e7f43 ddmadm
3838

@@ -46,6 +46,10 @@ mv ddmd ddmd-v2
4646
rm -rf zones/dendrite
4747
mkdir -p zones/dendrite
4848
tar -xzf dendrite-softnpu.tar.gz -C zones/dendrite
49+
sed -i "s#<service_fmri value='svc:/oxide/zone-network-setup:default' />##g" \
50+
zones/dendrite/root/var/svc/manifest/site/dendrite/manifest.xml
51+
sed -i "s#<service_fmri value='svc:/oxide/.*setup:default' />##g" \
52+
zones/dendrite/root/var/svc/manifest/site/tfport/manifest.xml
4953
popd
5054

5155
banner "install"

0 commit comments

Comments
 (0)