Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/spdk-common-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ jobs:
- {name: iscsi-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
- {name: iscsi-uring-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
- {name: short-fuzz-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
- {name: nvmf-no-huge-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
- {name: vfio-user-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
- {name: check-format-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
- {name: unittest-gcc-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
Expand Down Expand Up @@ -214,7 +215,7 @@ jobs:
# cijoe - for running cijoe workflows instead of writing own manual scrits;
# TODO: Installation doesn't take long but we should bake it into the container image.
- name: Install cijoe
if: ${{ contains(matrix.workflow.name, 'container') }}
if: ${{ contains(matrix.workflow.name, '-container-') }}
run: |
pip install cijoe==0.9.54

Expand Down Expand Up @@ -260,7 +261,7 @@ jobs:
tar xzf spdk-abi.tar.gz --strip 1

- name: Restore qcow2 image from cache
if: contains(matrix.workflow.name, 'vm') || contains(matrix.workflow.name, 'vfio-user')
if: contains(matrix.workflow.name, '-vm-') || contains(matrix.workflow.name, 'vfio-user')
id: restore-qcow2
uses: actions/cache/restore@v4
with:
Expand All @@ -269,15 +270,15 @@ jobs:

- name: Download VM Qcow2 image artifact
uses: actions/download-artifact@v4.1.8
if: (contains(matrix.workflow.name, 'vm') || contains(matrix.workflow.name, 'vfio-user')) && hashFiles(format('{0}_x86_64.qcow2',
if: (contains(matrix.workflow.name, '-vm-') || contains(matrix.workflow.name, 'vfio-user')) && hashFiles(format('{0}_x86_64.qcow2',
matrix.distro)) == ''
with:
name: vm-image-${{matrix.distro}}_x86_64
github-token: ${{ github.token }}
run-id: ${{ fromJson(needs.checkout_spdk.outputs.artifact_id)[ matrix.distro ] }}

- name: qemu-guest, initialize
if: ${{ contains(matrix.workflow.name, 'vm') }}
if: ${{ contains(matrix.workflow.name, '-vm-') }}
run: |
cd ci/cijoe
cijoe workflows/autorun.yaml guest_initialize guest_start guest_check \
Expand Down Expand Up @@ -311,7 +312,7 @@ jobs:
--monitor

- name: qemu-guest, shutdown
if: ${{ contains(matrix.workflow.name, 'vm') && contains(runner.labels, 'self-hosted') || env.ACT == 'true' }}
if: ${{ contains(matrix.workflow.name, '-vm-') && contains(runner.labels, 'self-hosted') || env.ACT == 'true' }}
run: |
cd ci/cijoe
cijoe workflows/autorun.yaml guest_shutdown \
Expand Down
10 changes: 10 additions & 0 deletions cijoe/configs/autorun_configs/nvmf-no-huge-container-autotest.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SPDK_RUN_FUNCTIONAL_TEST=1
SPDK_TEST_NVMF=1
SPDK_TEST_NVMF_TRANSPORT=tcp
SPDK_RUN_UBSAN=1
SPDK_RUN_ASAN=1
NET_TYPE=virt
SPDK_TEST_NO_HUGE=1
SPDK_TEST_SKIP_NVMF_KERNEL_TESTS=1
SKIP_HUGE=1
export DRIVER_OVERRIDE=none
4 changes: 4 additions & 0 deletions cijoe/workflows/autorun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ steps:
ln -sfn /usr/local/bin/perl /usr/bin/perl
USE_INSTALLED_CONTIGMEM=yes SKIP_HUGE=yes TEST_MIN_STORAGE_SIZE=0 SYSDIR="{{ local.env.HOME }}/git/freebsd/sys" /opt/spdk/autorun.sh /opt/configs/freebsd-vm-autotest.conf
- name: nvmf-no-huge-container-autotest
run: |
/opt/spdk/autorun.sh /opt/configs/nvmf-no-huge-container-autotest.conf
- name: unittest-gcc-container-autotest
run: |
rootdir=/opt/spdk && cd $rootdir && source ./test/common/autobuild_common.sh /opt/configs/unittest-gcc-container-autotest.conf && ocf_precompile && unittest_build && ./test/unit/unittest.sh
Expand Down
Loading