Skip to content

Commit 82c9ec1

Browse files
frezbofrezbo
committed
chore(ci): add tests with longhorn v2 engine
Add tests with longhorn v2 engine. Fixes: siderolabs#9669 Signed-off-by: Noel Georgi <[email protected]>
1 parent 689ea1d commit 82c9ec1

16 files changed

+227
-110
lines changed

‎.github/workflows/ci.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-22T14:28:18Z by kres 3075de9.
3+
# Generated on 2025-01-22T17:37:55Z by kres 3075de9.
44

55
name: default
66
concurrency:
@@ -2957,10 +2957,14 @@ jobs:
29572957
EXTRA_TEST_ARGS: -talos.csi=longhorn
29582958
GITHUB_STEP_NAME: ${{ github.job}}-e2e-qemu-csi-longhorn
29592959
IMAGE_REGISTRY: registry.dev.siderolabs.io
2960-
QEMU_MEMORY_WORKERS: "3072"
2960+
QEMU_EXTRA_DISKS: "1"
2961+
QEMU_EXTRA_DISKS_DRIVERS: nvme
2962+
QEMU_EXTRA_DISKS_SIZE: "12288"
2963+
QEMU_MEMORY_WORKERS: "4096"
29612964
QEMU_WORKERS: "3"
29622965
SHORT_INTEGRATION_TEST: "yes"
2963-
WITH_CONFIG_PATCH: '@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml'
2966+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/longhorn-cp.yaml'
2967+
WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml'
29642968
run: |
29652969
sudo -E make e2e-qemu
29662970
- name: save artifacts
@@ -3067,7 +3071,7 @@ jobs:
30673071
QEMU_MEMORY_WORKERS: "4096"
30683072
QEMU_WORKERS: "3"
30693073
SHORT_INTEGRATION_TEST: "yes"
3070-
WITH_CONFIG_PATCH: '@hack/test/patches/openebs-cp.yaml'
3074+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/openebs-cp.yaml'
30713075
WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/openebs.yaml'
30723076
run: |
30733077
sudo -E make e2e-qemu
@@ -3175,7 +3179,7 @@ jobs:
31753179
QEMU_MEMORY_WORKERS: "8192"
31763180
QEMU_WORKERS: "3"
31773181
SHORT_INTEGRATION_TEST: "yes"
3178-
WITH_CONFIG_PATCH: '@hack/test/patches/rook-ceph.yaml'
3182+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/rook-ceph.yaml'
31793183
run: |
31803184
sudo -E make e2e-qemu
31813185
- name: save artifacts

‎.github/workflows/integration-qemu-csi-longhorn-cron.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-21T10:29:14Z by kres 3075de9.
3+
# Generated on 2025-01-22T17:37:55Z by kres 3075de9.
44

55
name: integration-qemu-csi-longhorn-cron
66
concurrency:
@@ -112,10 +112,14 @@ jobs:
112112
EXTRA_TEST_ARGS: -talos.csi=longhorn
113113
GITHUB_STEP_NAME: ${{ github.job}}-e2e-qemu-csi-longhorn
114114
IMAGE_REGISTRY: registry.dev.siderolabs.io
115-
QEMU_MEMORY_WORKERS: "3072"
115+
QEMU_EXTRA_DISKS: "1"
116+
QEMU_EXTRA_DISKS_DRIVERS: nvme
117+
QEMU_EXTRA_DISKS_SIZE: "12288"
118+
QEMU_MEMORY_WORKERS: "4096"
116119
QEMU_WORKERS: "3"
117120
SHORT_INTEGRATION_TEST: "yes"
118-
WITH_CONFIG_PATCH: '@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml'
121+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/longhorn-cp.yaml'
122+
WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml'
119123
run: |
120124
sudo -E make e2e-qemu
121125
- name: save artifacts

‎.github/workflows/integration-qemu-csi-openebs-cron.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-21T10:29:14Z by kres 3075de9.
3+
# Generated on 2025-01-22T14:23:24Z by kres 3075de9.
44

55
name: integration-qemu-csi-openebs-cron
66
concurrency:
@@ -89,7 +89,7 @@ jobs:
8989
QEMU_MEMORY_WORKERS: "4096"
9090
QEMU_WORKERS: "3"
9191
SHORT_INTEGRATION_TEST: "yes"
92-
WITH_CONFIG_PATCH: '@hack/test/patches/openebs-cp.yaml'
92+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/openebs-cp.yaml'
9393
WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/openebs.yaml'
9494
run: |
9595
sudo -E make e2e-qemu

‎.github/workflows/integration-qemu-csi-rook-ceph-cron.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-21T10:29:14Z by kres 3075de9.
3+
# Generated on 2025-01-22T14:23:24Z by kres 3075de9.
44

55
name: integration-qemu-csi-rook-ceph-cron
66
concurrency:
@@ -89,7 +89,7 @@ jobs:
8989
QEMU_MEMORY_WORKERS: "8192"
9090
QEMU_WORKERS: "3"
9191
SHORT_INTEGRATION_TEST: "yes"
92-
WITH_CONFIG_PATCH: '@hack/test/patches/rook-ceph.yaml'
92+
WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/rook-ceph.yaml'
9393
run: |
9494
sudo -E make e2e-qemu
9595
- name: save artifacts

‎.kres.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ spec:
13521352
QEMU_MEMORY_WORKERS: 8192
13531353
QEMU_EXTRA_DISKS: 1
13541354
QEMU_EXTRA_DISKS_SIZE: 12288
1355-
WITH_CONFIG_PATCH: "@hack/test/patches/rook-ceph.yaml"
1355+
WITH_CONFIG_PATCH_CONTROLPLANE: "@hack/test/patches/rook-ceph.yaml"
13561356
EXTRA_TEST_ARGS: -talos.csi=rook-ceph
13571357
IMAGE_REGISTRY: registry.dev.siderolabs.io
13581358
- name: save-fio-benchmark
@@ -1441,8 +1441,12 @@ spec:
14411441
GITHUB_STEP_NAME: ${{ github.job}}-e2e-qemu-csi-longhorn
14421442
SHORT_INTEGRATION_TEST: yes
14431443
QEMU_WORKERS: 3
1444-
QEMU_MEMORY_WORKERS: 3072
1445-
WITH_CONFIG_PATCH: "@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml"
1444+
QEMU_MEMORY_WORKERS: 4096
1445+
QEMU_EXTRA_DISKS: 1
1446+
QEMU_EXTRA_DISKS_SIZE: 12288
1447+
QEMU_EXTRA_DISKS_DRIVERS: nvme
1448+
WITH_CONFIG_PATCH_CONTROLPLANE: "@hack/test/patches/longhorn-cp.yaml"
1449+
WITH_CONFIG_PATCH_WORKER: "@_out/installer-extensions-patch.yaml:@_out/kubelet-fat-patch.yaml:@hack/test/patches/longhorn.yaml"
14461450
EXTRA_TEST_ARGS: -talos.csi=longhorn
14471451
IMAGE_REGISTRY: registry.dev.siderolabs.io
14481452
- name: save-fio-benchmark
@@ -1508,7 +1512,7 @@ spec:
15081512
QEMU_MEMORY_WORKERS: 4096
15091513
QEMU_EXTRA_DISKS: 1
15101514
QEMU_EXTRA_DISKS_SIZE: 12288
1511-
WITH_CONFIG_PATCH: "@hack/test/patches/openebs-cp.yaml"
1515+
WITH_CONFIG_PATCH_CONTROLPLANE: "@hack/test/patches/openebs-cp.yaml"
15121516
WITH_CONFIG_PATCH_WORKER: "@hack/test/patches/openebs.yaml"
15131517
EXTRA_TEST_ARGS: -talos.csi=openebs
15141518
IMAGE_REGISTRY: registry.dev.siderolabs.io

‎hack/test/e2e-qemu.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,18 @@ case "${WITH_ISO:-false}" in
139139
;;
140140
esac
141141

142+
case "${WITH_CONFIG_PATCH_CONTROLPLANE:-false}" in
143+
false)
144+
;;
145+
*)
146+
[[ ! ${WITH_CONFIG_PATCH_CONTROLPLANE} =~ ^@ ]] && echo "WITH_CONFIG_PATCH_CONTROLPLANE variable should start with @" && exit 1
147+
148+
for i in ${WITH_CONFIG_PATCH_CONTROLPLANE//:/ }; do
149+
QEMU_FLAGS+=("--config-patch-control-plane=${i}")
150+
done
151+
;;
152+
esac
153+
142154
case "${WITH_CONFIG_PATCH_WORKER:-false}" in
143155
false)
144156
;;

‎hack/test/patches/longhorn-cp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
cluster:
3+
apiServer:
4+
admissionControl:
5+
- name: PodSecurity
6+
configuration:
7+
exemptions:
8+
namespaces:
9+
- longhorn-system

‎hack/test/patches/longhorn.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
---
12
machine:
3+
sysctls:
4+
vm.nr_hugepages: "1024"
5+
kernel:
6+
modules:
7+
- name: nvme_tcp
8+
- name: vfio_pci
9+
- name: uio_pci_generic
210
kubelet:
311
extraMounts:
412
- destination: /var/lib/longhorn
@@ -8,11 +16,3 @@ machine:
816
- bind
917
- rshared
1018
- rw
11-
cluster:
12-
apiServer:
13-
admissionControl:
14-
- name: PodSecurity
15-
configuration:
16-
exemptions:
17-
namespaces:
18-
- longhorn-system

‎hack/test/patches/openebs-cp.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
---
12
cluster:
23
apiServer:
34
admissionControl:
45
- name: PodSecurity
56
configuration:
6-
apiVersion: pod-security.admission.config.k8s.io/v1beta1
7-
kind: PodSecurityConfiguration
87
exemptions:
98
namespaces:
109
- openebs

‎hack/test/patches/openebs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
machine:
23
sysctls:
34
vm.nr_hugepages: "1024"

0 commit comments

Comments
 (0)