Skip to content

Commit 861ebac

Browse files
committed
run pre-release tests in parallel
So I don't have to wait over an hour to see if it worked or not. Also remove a `touch build.rs` that was leftover from when we needed the buildscript to determine the firecracker version. Signed-off-by: Patrick Roy <[email protected]>
1 parent f18bb50 commit 861ebac

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.buildkite/pipeline_pr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
release_grp = group(
5151
"📦 Release Sanity Build",
52-
"mkdir -p ./test_results && touch ./test_results/test-report.json && ./tools/devtool -y sh ./tools/release.sh --libc musl --profile release --make-release",
52+
"./tools/devtool -y make_release",
5353
**defaults_once_per_architecture,
5454
)
5555

tools/devtool

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,10 @@ cmd_build() {
486486
}
487487

488488
function cmd_make_release {
489-
cmd_test -- --reruns 2 || die "Tests failed!"
489+
OPTS="--reruns=7"
490+
# run build tests first so that functional tests reuse compilation artifacts
491+
cmd_test -- $OPTS --json-report-file=../test_results/test-report-perf+build.json integration_tests/{build,performance} || die "Tests failed!"
492+
cmd_test -- $OPTS --json-report-file=../test_results/test-report-functional+security.json -n8 --dist=worksteal integration_tests/{functional,security,style} || die "Tests failed!"
490493

491494
run_devctr \
492495
--user "$(id -u):$(id -g)" \

tools/release.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ if [ "$PROFILE" = "release" ]; then
115115
CARGO_OPTS+=" --release"
116116
fi
117117

118-
# Artificially trigger a re-run of the build script,
119-
# to make sure that `firecracker --version` reports the latest changes.
120-
touch build.rs
121-
122118
ARTIFACTS=(firecracker jailer seccompiler-bin rebase-snap cpu-template-helper snapshot-editor)
123119

124120
if [ "$LIBC" == "gnu" ]; then
@@ -167,7 +163,8 @@ cp -v -t "$RELEASE_DIR" LICENSE NOTICE THIRD-PARTY
167163
check_swagger_artifact src/api_server/swagger/firecracker.yaml "$VERSION"
168164
cp -v src/api_server/swagger/firecracker.yaml "$RELEASE_DIR/firecracker_spec-$VERSION.yaml"
169165

170-
cp -v test_results/test-report.json "$RELEASE_DIR/"
166+
cp -v test_results/test-report-functional+security.json "$RELEASE_DIR/"
167+
cp -v test_results/test-report-perf+build.json "$RELEASE_DIR/"
171168

172169
(
173170
cd "$RELEASE_DIR"

0 commit comments

Comments
 (0)