Forward-Port 1.5 branch hot-fixes + correctly bump snapshot version for 1.6

.buildkite/pipeline_pr.py

@@ -49,7 +49,7 @@
 
 release_grp = group(
     "📦 Release Sanity Build",
-    "mkdir -p ./test_results && touch ./test_results/test-report.json && ./tools/devtool -y sh ./tools/release.sh --libc musl --profile release --make-release",
+    "./tools/devtool -y make_release",
     **defaults_once_per_architecture,
 )
 

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## Unreleased
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [1.5.0]
 
 ### Added
 

src/snapshot-editor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snapshot-editor"
-version = "1.5.0"
+version = "1.6.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

src/vmm/src/version_map.rs

@@ -81,11 +81,12 @@ lazy_static! {
         version_map.set_type_version(VcpuState::type_id(), 2);
 
         version_map.set_type_version(VmState::type_id(), 2);
-        version_map.set_type_version(VirtioDeviceState::type_id(), 2);
 
         // v1.6 state change mappings
         version_map.new_version();
 
+        version_map.set_type_version(VirtioDeviceState::type_id(), 2);
+
         version_map
     };
 

tests/framework/microvm.py

@@ -865,7 +865,7 @@ def kill(self):
 class Serial:
     """Class for serial console communication with a Microvm."""
 
-    RX_TIMEOUT_S = 20
+    RX_TIMEOUT_S = 60
 
     def __init__(self, vm):
         """Initialize a new Serial object."""

tests/integration_tests/functional/test_concurrency.py

@@ -80,6 +80,7 @@ def test_run_concurrency(microvm_factory, guest_kernel, rootfs):
 
     def launch1():
         microvm = microvm_factory.build(guest_kernel, rootfs)
+        microvm.time_api_requests = False  # is flaky because of parallelism
         microvm.spawn()
         microvm.basic_config(vcpu_count=1, mem_size_mib=128)
         microvm.add_net_iface()

tools/devtool

@@ -486,7 +486,10 @@ cmd_build() {
 }
 
 function cmd_make_release {
-    cmd_test -- --reruns 2 || die "Tests failed!"
+    OPTS="--reruns=7"
+    # run build tests first so that functional tests reuse compilation artifacts
+    cmd_test -- $OPTS --json-report-file=../test_results/test-report-perf+build.json integration_tests/{build,performance} || die "Tests failed!"
+    cmd_test -- $OPTS --json-report-file=../test_results/test-report-functional+security.json -n8 --dist=worksteal integration_tests/{functional,security,style} || die "Tests failed!"
 
     run_devctr \
         --user "$(id -u):$(id -g)" \

tools/release.sh

@@ -115,17 +115,13 @@ if [ "$PROFILE" = "release" ]; then
     CARGO_OPTS+=" --release"
 fi
 
-# Artificially trigger a re-run of the build script,
-# to make sure that `firecracker --version` reports the latest changes.
-touch build.rs
-
-ARTIFACTS=(firecracker jailer seccompiler-bin rebase-snap cpu-template-helper)
+ARTIFACTS=(firecracker jailer seccompiler-bin rebase-snap cpu-template-helper snapshot-editor)
 
 if [ "$LIBC" == "gnu" ]; then
     # Don't build jailer. See commit 3bf285c8f
     echo "Not building jailer because glibc selected instead of musl"
     CARGO_OPTS+=" --exclude jailer"
-    ARTIFACTS=(firecracker seccompiler-bin rebase-snap cpu-template-helper)
+    ARTIFACTS=(firecracker seccompiler-bin rebase-snap cpu-template-helper snapshot-editor)
 fi
 
 say "Building version=$VERSION, profile=$PROFILE, target=$CARGO_TARGET..."
@@ -167,7 +163,8 @@ cp -v -t "$RELEASE_DIR" LICENSE NOTICE THIRD-PARTY
 check_swagger_artifact src/api_server/swagger/firecracker.yaml "$VERSION"
 cp -v src/api_server/swagger/firecracker.yaml "$RELEASE_DIR/firecracker_spec-$VERSION.yaml"
 
-cp -v test_results/test-report.json "$RELEASE_DIR/"
+cp -v test_results/test-report-functional+security.json "$RELEASE_DIR/"
+cp -v test_results/test-report-perf+build.json "$RELEASE_DIR/"
 
 (
     cd "$RELEASE_DIR"

tools/update-credits.sh

@@ -31,5 +31,5 @@ written in Rust with a focus on safety and security. Thanks go to:
 Contributors to the Firecracker repository:
 EOH
     echo
-    git log --format='* %aN <%aE>' | LC_ALL=C.UTF-8 sort -uf
+    git log --format='* %aN <%aE>' | LC_ALL=C.UTF-8 sort -uf | grep -v "dependabot"
 } > CREDITS.md