Skip to content

Commit ec51b88

Browse files
Update fcuvm container version
- Updated Rust version to 1.38.0 - Updated Python version to 3.6.8 For aarch64, rustfmt is not available with the latest Rust. Hence, the style test is now temporarily disabled until the rustfmt team creates a build for aarch64 as well. This is tracked in: #1322 Another side effect of the container update is that the coverage dropped from 86.0 to 85.6. The same code tested with the previous kcov version was generating a coverage of 86.1 for the code changes submitted in this PR. Hence, the coverage drop is more related to the kcov/rust update than to the changed lines of code. Signed-off-by: Andreea Florescu <[email protected]>
1 parent 9281173 commit ec51b88

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

tests/integration_tests/build/test_coverage.py

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

2020
import host_tools.cargo_build as host # pylint: disable=import-error
2121

22-
COVERAGE_TARGET_PCT = 86.0
22+
COVERAGE_TARGET_PCT = 85.6
2323
COVERAGE_MAX_DELTA = 0.01
2424

2525
CARGO_KCOV_REL_PATH = os.path.join(host.CARGO_BUILD_REL_PATH, 'kcov')

tests/integration_tests/build/test_style.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515

1616

1717
@pytest.mark.timeout(120)
18+
@pytest.mark.skipif(
19+
platform.machine() != "x86_64",
20+
reason="rustfmt is not available on Rust 1.38 on aarch64"
21+
)
1822
def test_rust_style():
1923
"""Fail if there's misbehaving Rust style in this repo."""
2024
# Check that the output is empty.

tools/devctr/Dockerfile.aarch64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:18.04
44
# The Rust toolchain layer will get updated most frequently, but we could keep the system
55
# dependencies layer intact for much longer.
66

7-
ARG RUST_TOOLCHAIN="1.35.0"
7+
ARG RUST_TOOLCHAIN="1.38.0"
88
ARG TMP_BUILD_DIR=/tmp/build
99
ARG FIRECRACKER_SRC_DIR="/firecracker"
1010
ARG FIRECRACKER_BUILD_DIR="$FIRECRACKER_SRC_DIR/build"
@@ -68,7 +68,6 @@ RUN apt-get update \
6868
#
6969
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
7070
&& rustup target add aarch64-unknown-linux-musl \
71-
&& rustup component add rustfmt \
7271
&& rm -rf "$CARGO_HOME/registry" \
7372
&& ln -s "$CARGO_REGISTRY_DIR" "$CARGO_HOME/registry" \
7473
&& rm -rf "$CARGO_HOME/git" \

tools/devctr/Dockerfile.x86_64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:18.04
44
# The Rust toolchain layer will get updated most frequently, but we could keep the system
55
# dependencies layer intact for much longer.
66

7-
ARG RUST_TOOLCHAIN="1.35.0"
7+
ARG RUST_TOOLCHAIN="1.38.0"
88
ARG TMP_BUILD_DIR=/tmp/build
99
ARG FIRECRACKER_SRC_DIR="/firecracker"
1010
ARG FIRECRACKER_BUILD_DIR="$FIRECRACKER_SRC_DIR/build"

tools/devtool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
# Development container image (name:tag)
7474
# This should be updated whenever we upgrade the development container.
7575
# (Yet another step on our way to reproducible builds.)
76-
DEVCTR_IMAGE="fcuvm/dev:v11"
76+
DEVCTR_IMAGE="fcuvm/dev:v12"
7777

7878
# Naming things is hard
7979
MY_NAME="Firecracker $(basename "$0")"

0 commit comments

Comments
 (0)