Skip to content

Commit

Permalink
Fix Packit setup
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Faria <[email protected]>
  • Loading branch information
albertofaria committed Apr 23, 2024
1 parent f4b0a96 commit b4779d9
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ jobs:
project: podman-next
enable_net: true

# Unit tests
# Lint
- job: tests
trigger: pull_request
skip_build: true
targets:
- fedora-all-aarch64
- fedora-all-x86_64
identifier: unit_test
tmt_plan: "/plans/unit_test"
# Only need to test on one target
- fedora-latest-stable-x86_64
identifier: lint
tmt_plan: /plans/lint

# Validate test
# Test
- job: tests
trigger: pull_request
skip_build: true
targets:
# Only need to test on one target
- fedora-latest-stable-x86_64
identifier: validate_test
tmt_plan: "/plans/validate_test"
- fedora-all-aarch64
- fedora-all-x86_64
identifier: test
tmt_plan: /plans/test
17 changes: 15 additions & 2 deletions plans/main.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,37 @@ prepare:
- name: Install dependencies
how: install
package:
- bash
- cargo
- clippy
- coreutils
- crun
- genisoimage
- grep
- guestfs-tools
- libselinux-devel
- libvirt-client
- libvirt-daemon-driver-qemu
- libvirt-daemon-log
- make
- openssh-clients
- podman
- qemu-img
- qemu-system-x86-core
- rustfmt
- shadow-utils
- util-linux
- virtiofsd
- name: Set up libvirt
how: shell
script:
- sudo systemctl start virtqemud
- systemctl start virtqemud

/test:
summary: Test
execute:
how: tmt
script: PATH=$PATH:/root/.cargo/bin make test
script: PATH=$PATH:/root/.cargo/bin LIBGUESTFS_BACKEND=direct make test

/lint:
summary: Lint
Expand Down
2 changes: 1 addition & 1 deletion src/commands/create/domain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn generate(
.perform_indent(true)
.create_writer(File::create(path.as_ref())?);

s(&mut w, "domain", &[("type", "kvm")], |w| {
s(&mut w, "domain", &[], |w| {
st(w, "name", &[], "domain")?;

se(w, "cpu", &[("mode", "host-passthrough")])?;
Expand Down
6 changes: 4 additions & 2 deletions src/commands/create/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,10 @@ fn set_up_extra_container_mounts_and_devices(spec: &mut oci_spec::runtime::Spec)
.unwrap(),
);

add_bind_mount(spec, "/dev/kvm");
add_char_dev(spec, "/dev/kvm")?;
if Path::new("/dev/kvm").exists() {
add_bind_mount(spec, "/dev/kvm");
add_char_dev(spec, "/dev/kvm")?;
}

// in case user sets up VFIO passthrough by overriding the libvirt XML
for entry in fs::read_dir("/dev/vfio")? {
Expand Down
5 changes: 3 additions & 2 deletions tests/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,14 @@ __rel() {

__build_runtime() {
__big_log 33 'Building crun-vm...'
__log_and_run cargo build --manifest-path "$( __rel "$repo_root/Cargo.toml" )"
__log_and_run cargo build
runtime=$repo_root/target/debug/crun-vm
}

__extra_cleanup() { :; }

repo_root=$( readlink -e "$( dirname "$0" )/.." )
cd "$repo_root"

temp_dir=$( mktemp -d )
trap '__extra_cleanup; rm -fr "$temp_dir"' EXIT
Expand Down Expand Up @@ -145,7 +146,7 @@ build)

# launch VM from base image file

__log_and_run podman run \
__log_and_run podman run --log-level debug \
--name "$container_name-build" \
--runtime "$runtime" \
--memory 8g \
Expand Down

0 comments on commit b4779d9

Please sign in to comment.