Skip to content
Merged
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
38 changes: 38 additions & 0 deletions defconfigs/nfs-fstests
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# pNFS configuration for filesystem testing with fstests

# Use libvirt/QEMU for virtualization
CONFIG_GUESTFS=y
CONFIG_LIBVIRT=y

# Enable workflows
CONFIG_WORKFLOWS=y
CONFIG_WORKFLOW_LINUX_CUSTOM=y

# Linux kernel building with 9P for development
CONFIG_BOOTLINUX=y
CONFIG_BOOTLINUX_9P=y
CONFIG_BOOTLINUX_LINUS=y
CONFIG_BOOTLINUX_TREE_LINUS=y

# Enable testing workflows
CONFIG_WORKFLOWS_TESTS=y
CONFIG_WORKFLOWS_LINUX_TESTS=y
CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y

# Enable fstests workflow with pNFS testing
CONFIG_KDEVOPS_WORKFLOW_DEDICATE_FSTESTS=y
CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS=y
CONFIG_FSTESTS_NFS=y
CONFIG_FSTESTS_FSTYP="nfs"

# Enable manual coverage for NFS to select pNFS
CONFIG_FSTESTS_NFS_MANUAL_COVERAGE=y
CONFIG_FSTESTS_NFS_SECTION_PNFS=y
CONFIG_FSTESTS_NFS_SECTION_V42=y
CONFIG_FSTESTS_NFS_SECTION_V41=y

# Use kdevops NFS server for fstests
CONFIG_FSTESTS_USE_KDEVOPS_NFSD=y

# Enable systemd journal remote for debugging
CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE=y
38 changes: 38 additions & 0 deletions defconfigs/nfs-gitr
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# NFS configuration for git regression testing
# Tests git operations on NFS mounts with pNFS export capability

# Use libvirt/QEMU for virtualization
CONFIG_GUESTFS=y
CONFIG_LIBVIRT=y

# Enable workflows
CONFIG_WORKFLOWS=y
CONFIG_WORKFLOW_LINUX_CUSTOM=y

# Linux kernel building with 9P for development
CONFIG_BOOTLINUX=y
CONFIG_BOOTLINUX_9P=y
CONFIG_BOOTLINUX_LINUS=y
CONFIG_BOOTLINUX_TREE_LINUS=y

# Enable testing workflows
CONFIG_WORKFLOWS_TESTS=y
CONFIG_WORKFLOWS_LINUX_TESTS=y
CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y

# Enable gitr workflow with pNFS testing
CONFIG_KDEVOPS_WORKFLOW_DEDICATE_GITR=y
CONFIG_KDEVOPS_WORKFLOW_ENABLE_GITR=y

# Enable pNFS section for gitr workflow
CONFIG_GITR_NFS_SECTION_PNFS=y
CONFIG_GITR_NFS_SECTION_V42=y

# Use kdevops NFS server
CONFIG_GITR_USE_KDEVOPS_NFSD=y

# Enable kdevops NFS server setup
CONFIG_KDEVOPS_SETUP_NFSD=y

# Enable systemd journal remote for debugging
CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE=y
31 changes: 31 additions & 0 deletions defconfigs/nfs-ltp
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# pNFS configuration for Linux Test Project (LTP)
# Note: LTP doesn't specifically test pNFS, but can run on pNFS mounts

# Use libvirt/QEMU for virtualization
CONFIG_GUESTFS=y
CONFIG_LIBVIRT=y

# Enable workflows
CONFIG_WORKFLOWS=y
CONFIG_WORKFLOW_LINUX_CUSTOM=y

# Linux kernel building with 9P for development
CONFIG_BOOTLINUX=y
CONFIG_BOOTLINUX_9P=y
CONFIG_BOOTLINUX_LINUS=y
CONFIG_BOOTLINUX_TREE_LINUS=y

# Enable testing workflows
CONFIG_WORKFLOWS_TESTS=y
CONFIG_WORKFLOWS_LINUX_TESTS=y
CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y

# Enable LTP workflow
CONFIG_KDEVOPS_WORKFLOW_DEDICATE_LTP=y
CONFIG_KDEVOPS_WORKFLOW_ENABLE_LTP=y

# Use kdevops-provided NFS server for pNFS mount
CONFIG_KDEVOPS_SETUP_NFSD=y

# Enable systemd journal remote for debugging
CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE=y
30 changes: 30 additions & 0 deletions defconfigs/nfstests
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# NFS configuration for NFStest testing suite

# Use libvirt/QEMU for virtualization
CONFIG_GUESTFS=y
CONFIG_LIBVIRT=y

# Enable workflows
CONFIG_WORKFLOWS=y
CONFIG_WORKFLOW_LINUX_CUSTOM=y

# Linux kernel building with 9P for development
CONFIG_BOOTLINUX=y
CONFIG_BOOTLINUX_9P=y
CONFIG_BOOTLINUX_LINUS=y
CONFIG_BOOTLINUX_TREE_LINUS=y

# Enable testing workflows
CONFIG_WORKFLOWS_TESTS=y
CONFIG_WORKFLOWS_LINUX_TESTS=y
CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y

# Enable nfstest workflow
CONFIG_KDEVOPS_WORKFLOW_DEDICATE_NFSTEST=y
CONFIG_KDEVOPS_WORKFLOW_ENABLE_NFSTEST=y

# Use kdevops-provided NFS server
CONFIG_KDEVOPS_SETUP_NFSD=y

# Enable systemd journal remote for debugging
CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE=y
34 changes: 34 additions & 0 deletions defconfigs/pynfs-pnfs-block
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# PyNFS configuration for pNFS block layout protocol testing
# Specifically tests pNFS block layout protocol conformance

# Use libvirt/QEMU for virtualization
CONFIG_GUESTFS=y
CONFIG_LIBVIRT=y

# Enable workflows
CONFIG_WORKFLOWS=y
CONFIG_WORKFLOW_LINUX_CUSTOM=y

# Linux kernel building with 9P for development
CONFIG_BOOTLINUX=y
CONFIG_BOOTLINUX_9P=y
CONFIG_BOOTLINUX_LINUS=y
CONFIG_BOOTLINUX_TREE_LINUS=y

# Enable testing workflows
CONFIG_WORKFLOWS_TESTS=y
CONFIG_WORKFLOWS_LINUX_TESTS=y
CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y

# Enable pynfs workflow for pNFS protocol testing
CONFIG_KDEVOPS_WORKFLOW_DEDICATE_PYNFS=y
CONFIG_KDEVOPS_WORKFLOW_ENABLE_PYNFS=y

# Enable pNFS block layout tests
CONFIG_PYNFS_PNFS_BLOCK=y

# Use kdevops-provided NFS server
CONFIG_KDEVOPS_SETUP_NFSD=y

# Enable systemd journal remote for debugging
CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE=y
3 changes: 3 additions & 0 deletions playbooks/roles/devconfig/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@
lstrip_blocks: true
when:
- devconfig_enable_systemd_journal_remote|bool
- "'nfsd' not in group_names"

- name: Enable and restart systemd-journal-upload.service on the client
tags: ["journal", "journal-upload-restart"]
Expand All @@ -578,6 +579,7 @@
daemon_reload: true
when:
- devconfig_enable_systemd_journal_remote|bool
- "'nfsd' not in group_names"

- name: Ensure systemd-journal-remote.service is running on the server
tags: ["journal-status"]
Expand All @@ -602,6 +604,7 @@
state: started
when:
- devconfig_enable_systemd_journal_remote|bool
- "'nfsd' not in group_names"

- name: Set up the client /etc/systemd/timesyncd.conf
tags: ["timesyncd"]
Expand Down
5 changes: 3 additions & 2 deletions playbooks/roles/fstests/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@
export_options: "{{ nfsd_export_options }}"
export_fstype: "{{ fstests_nfs_export_fstype }}"
export_size: 20g
export_pnfs: "{{ fstests_nfs_section_pnfs | bool }}"
export_pnfs: false
when:
- fstests_fstyp == "nfs"
- fstests_nfs_use_kdevops_nfsd|bool
Expand All @@ -772,7 +772,7 @@
export_options: "{{ nfsd_export_options }}"
export_fstype: "{{ fstests_nfs_export_fstype }}"
export_size: 30g
export_pnfs: "{{ fstests_nfs_section_pnfs | bool }}"
export_pnfs: false
when:
- fstests_fstyp == "nfs"
- fstests_nfs_use_kdevops_nfsd|bool
Expand Down Expand Up @@ -1137,6 +1137,7 @@
state: started
when:
- devconfig_enable_systemd_journal_remote|bool
- "'nfsd' not in group_names"

- name: Hint to watchdog tests are about to kick off
ansible.builtin.file:
Expand Down
4 changes: 4 additions & 0 deletions playbooks/roles/fstests/templates/nfs/nfs.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ SCRATCH_DEV="{{ fstests_nfs_scratch_devpool }}"
RESULT_BASE=$PWD/results/$HOST/$(uname -r)
TEST_DEV={{ fstests_nfs_test_dev }}
CANON_DEVS=yes
{% if fstests_soak_duration > 0 -%}
SOAK_DURATION={{ fstests_soak_duration }}
{% endif %}

{% if fstests_nfs_section_pnfs -%}

# Test pNFS block
Expand Down
3 changes: 3 additions & 0 deletions playbooks/roles/iscsi/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ iscsi_target_packages:
- targetcli-fb
- sg3-utils

iscsi_initiator_packages:
- open-iscsi

iscsi_target_service_name: targetclid.socket
1 change: 0 additions & 1 deletion playbooks/roles/nfsd_add_export/tasks/storage/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

- name: Format new volume for {{ export_fstype }}
become: true
become_flags: "su - -c"
become_method: ansible.builtin.sudo
delegate_to: "{{ server_host }}"
community.general.filesystem:
Expand Down
Loading
Loading