From 227bdd329d6c214a7365ad0fdad85508d3e396b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 8 Feb 2024 18:15:56 +0100 Subject: [PATCH 1/2] ci: move microvm image into arch directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 4 ++-- data/{x86_64-fc/hello_world => x86_64/hello_world-microvm} | 0 xtask/src/artifact.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename data/{x86_64-fc/hello_world => x86_64/hello_world-microvm} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86d7cf6d..64592118 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,6 +122,6 @@ jobs: - name: Run UEFI (release) run: cargo xtask ci qemu --target x86_64-uefi --accel --release - name: Run Firecracker (hello_world, dev) - run: cargo xtask ci firecracker --target x86_64-fc --features fc + run: cargo xtask ci firecracker --target x86_64-fc --features fc --image hello_world-microvm - name: Run Firecracker (hello_world, release) - run: cargo xtask ci firecracker --target x86_64-fc --features fc --release \ No newline at end of file + run: cargo xtask ci firecracker --target x86_64-fc --features fc --image hello_world-microvm --release diff --git a/data/x86_64-fc/hello_world b/data/x86_64/hello_world-microvm similarity index 100% rename from data/x86_64-fc/hello_world rename to data/x86_64/hello_world-microvm diff --git a/xtask/src/artifact.rs b/xtask/src/artifact.rs index e93f47f5..9c97471f 100644 --- a/xtask/src/artifact.rs +++ b/xtask/src/artifact.rs @@ -69,6 +69,6 @@ impl Artifact { } pub fn ci_image(&self, image: &str) -> PathBuf { - ["data", self.target.name(), image].iter().collect() + ["data", self.target.arch(), image].iter().collect() } } From 60216569b4cd6904088efff03375747ba9d70010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 8 Feb 2024 18:19:23 +0100 Subject: [PATCH 2/2] ci: test QEMU microvm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64592118..becc4f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,6 +80,12 @@ jobs: run: cargo xtask ci qemu --target ${{ matrix.target }} - name: Run VM (hello_world, release) run: cargo xtask ci qemu --target ${{ matrix.target }} --release + - name: Run VM (hello_world-microvm, dev) + if: matrix.target == 'x86_64' && matrix.os == 'ubuntu-latest' + run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_world-microvm --microvm + - name: Run VM (hello_world-microvm, release) + if: matrix.target == 'x86_64' && matrix.os == 'ubuntu-latest' + run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_world-microvm --microvm --release - name: Run VM (hello_c, dev) if: matrix.target == 'x86_64' run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_c @@ -117,6 +123,10 @@ jobs: run: cargo xtask ci qemu --target x86_64 --accel - name: Run QEMU (hello_world, release) run: cargo xtask ci qemu --target x86_64 --accel --release + - name: Run QEMU (hello_world-microvm, dev) + run: cargo xtask ci qemu --target x86_64 --accel --image hello_world-microvm --microvm + - name: Run QEMU (hello_world-microvm, release) + run: cargo xtask ci qemu --target x86_64 --accel --image hello_world-microvm --microvm --release - name: Run UEFI (dev) run: cargo xtask ci qemu --target x86_64-uefi --accel - name: Run UEFI (release)