Skip to content

Commit 366286d

Browse files
committed
Run sled-agent in its own project
1 parent 2349feb commit 366286d

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

.github/buildomat/jobs/deploy.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,12 @@ pfexec chmod +x /usr/oxide/oxide
291291
curl -sSfL -o debian-11-genericcloud-amd64.raw \
292292
http://catacomb.eng.oxide.computer:12346/debian-11-genericcloud-amd64.raw
293293

294+
#
295+
# Create the "omicron" project that sled-agent will inhabit.
296+
#
297+
projects -l omicron >/dev/null 2>&1 || \
298+
projadd -c 'The Oxide Control Plane' omicron
299+
294300
#
295301
# The lab-netdev target is a ramdisk system that is always cleared
296302
# out between runs, so it has not had any state yet that requires

smf/sled-agent/manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<service_fmri value='svc:/system/t6init' />
3838
</dependency>
3939

40-
<method_context>
40+
<method_context project='omicron'>
4141
<method_environment>
4242
<envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
4343
</method_environment>

tools/install_runner_prerequisites.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ if [[ "${HOST_OS}" == "SunOS" ]]; then
155155
#
156156
# create_virtual_hardware.sh will use those to setup the softnpu zone
157157
retry ./tools/ci_download_softnpu_machinery
158+
159+
# Create the omicron project
160+
projects -l omicron >/dev/null 2>&1 || \
161+
projadd -c 'The Oxide Control Plane' omicron
158162
fi
159163

160164
echo "All runner prerequisites installed successfully"

0 commit comments

Comments
 (0)