diff --git a/.packit.yaml b/.packit.yaml index 7fa734e..0f0cfa6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -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 diff --git a/plans/main.fmf b/plans/main.fmf index d9bd438..da6dc19 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -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 diff --git a/tests/env.sh b/tests/env.sh index d912c48..c128259 100755 --- a/tests/env.sh +++ b/tests/env.sh @@ -107,7 +107,8 @@ __rel() { __build_runtime() { __big_log 33 'Building crun-vm...' - __log_and_run cargo build --manifest-path "$( __rel "$repo_root/Cargo.toml" )" + __log_and_run cd "$( __rel "$repo_root" )" + __log_and_run cargo build runtime=$repo_root/target/debug/crun-vm }