Skip to content

Commit fdfccba

Browse files
zeeshanlakhanizeeshanlakhani
committed
[deps] merge main + dep updates for multicast end-to-end across repos
Also carries the tools script fixes from #10825 (opte override p5p publisher and gcc-runtime version parse), so the install scripts work on this branch before that PR lands on main.
2 parents f5c502e + 03a483e commit fdfccba

771 files changed

Lines changed: 28940 additions & 9407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/buildomat/build-and-test.sh‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
5+
26

37
set -o errexit
48
set -o pipefail
59
set -o xtrace
610

11+
#
12+
# Set up a custom temporary directory within whatever one we were given so that
13+
# we can check later whether we left detritus around.
14+
#
15+
TEST_TMPDIR='/var/tmp/omicron_tmp'
16+
echo "tests will store ephemeral output in $TEST_TMPDIR" >&2
17+
mkdir "$TEST_TMPDIR"
18+
719
#
820
# Set up our PATH for the test suite.
921
#
@@ -24,13 +36,6 @@ cargo --version
2436
rustc --version
2537
curl -sSfL --retry 10 https://get.nexte.st/"$NEXTEST_VERSION"/"$1" | gunzip | tar -xvf - -C ~/.cargo/bin
2638

27-
#
28-
# Set up a custom temporary directory within whatever one we were given so that
29-
# we can check later whether we left detritus around.
30-
#
31-
TEST_TMPDIR='/var/tmp/omicron_tmp'
32-
echo "tests will store ephemeral output in $TEST_TMPDIR" >&2
33-
mkdir "$TEST_TMPDIR"
3439

3540
OUTPUT_DIR='/work'
3641
echo "tests will store non-ephemeral output in $OUTPUT_DIR" >&2
@@ -110,16 +115,6 @@ export CARGO_INCREMENTAL=0
110115
export RUSTC_BOOTSTRAP=1
111116

112117
# Build all the packages and tests, and keep track of how long each took to build.
113-
#
114-
# The build graph ends up building several bin/test targets that depend on
115-
# omicron-nexus at the same time, which uses significant memory to compile on
116-
# illumos. To mitigate this we build everything except omicron-nexus's bin/test
117-
# targets first, then finish the build after.
118-
#
119-
# Both invocations use the same flags to avoid cache invalidation.
120-
# We collect timing data only from the second (full workspace) build.
121-
ptime -m cargo --config 'build.analysis.enabled=true' build -Zbuild-analysis \
122-
--workspace --exclude=omicron-nexus --tests --locked --verbose
123118
ptime -m cargo --config 'build.analysis.enabled=true' build -Zbuild-analysis \
124119
--workspace --tests --locked --verbose
125120
cp "$(ls -t "${CARGO_HOME:-$HOME/.cargo}/log/"*.jsonl | head -1)" \

‎.github/buildomat/ci-env.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
15
# Setup shared across Buildomat CI builds.
26
#
37
# This file contains environment variables shared across Buildomat CI jobs.
48

59
# Color the output for easier readability.
610
export CARGO_TERM_COLOR=always
11+
12+
# On illumos, store crashing process cores in the test temp dir so that:
13+
#
14+
# * Any core files are uploaded by Buildomat.
15+
# * Core files cause the CI job to fail even if the run is otherwise successful.
16+
#
17+
# `-p` sets the pattern on this shell, and child processes of the shell inherit
18+
# it.
19+
if [[ "$(uname -s)" == "SunOS" ]]; then
20+
coreadm -p '/var/tmp/omicron_tmp/core.%f.%p.core'
21+
fi

‎.github/buildomat/jobs/a4x2-deploy.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "a4x2-deploy"
47
#: variety = "basic"

‎.github/buildomat/jobs/a4x2-prepare.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "a4x2-prepare"
47
#: variety = "basic"

‎.github/buildomat/jobs/build-and-test-helios.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "build-and-test (helios)"
47
#: variety = "basic"
@@ -14,9 +17,6 @@
1417
#: "!/var/tmp/omicron_tmp/crdb-base*",
1518
#: "!/var/tmp/omicron_tmp/rustc*",
1619
#: ]
17-
#: access_repos = [
18-
#: "oxidecomputer/dendrite"
19-
#: ]
2020
#:
2121
#: [[publish]]
2222
#: series = "junit-helios"

‎.github/buildomat/jobs/build-and-test-linux.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "build-and-test (ubuntu-22.04)"
47
#: variety = "basic"
@@ -13,9 +16,6 @@
1316
#: "!/var/tmp/omicron_tmp/crdb-base*",
1417
#: "!/var/tmp/omicron_tmp/rustc*",
1518
#: ]
16-
#: access_repos = [
17-
#: "oxidecomputer/dendrite",
18-
#: ]
1919
#:
2020
#: [[publish]]
2121
#: series = "junit-linux"

‎.github/buildomat/jobs/check-features.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "check-features (helios)"
47
#: variety = "basic"

‎.github/buildomat/jobs/clippy.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "clippy (helios)"
47
#: variety = "basic"

‎.github/buildomat/jobs/deploy.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "helios / deploy"
47
#: variety = "basic"

‎.github/buildomat/jobs/omicron-common.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
25
#:
36
#: name = "omicron-common (helios)"
47
#: variety = "basic"

0 commit comments

Comments
 (0)