Skip to content

Commit 90ce53a

Browse files
authored
[test] Allow parallel execution for luks remount e2e test (#377)
`pod-pvc-luks-remount` test is using /tmp/luks-test when running tests againts multiple environments from one machine it's causing conflicts.
1 parent 4c6c766 commit 90ce53a

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

tests/e2e/test/pod-pvc-luks-remount/chainsaw-test.yaml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ spec:
106106
content: |
107107
set -xe
108108
# Create temp directory
109-
mkdir -p /tmp/luks-test
109+
mkdir -p /tmp/luks-test/$NAMESPACE
110110
111111
# Store PV name and volume handle
112-
kubectl get pvc -n $NAMESPACE pvc-filesystem-luks -o jsonpath='{.spec.volumeName}' > /tmp/luks-test/pvname
113-
kubectl get pv $(cat /tmp/luks-test/pvname) -o jsonpath='{.spec.csi.volumeHandle}' > /tmp/luks-test/volumehandle
112+
kubectl get pvc -n $NAMESPACE pvc-filesystem-luks -o jsonpath='{.spec.volumeName}' > /tmp/luks-test/$NAMESPACE/pvname
113+
kubectl get pv $(cat /tmp/luks-test/$NAMESPACE/pvname) -o jsonpath='{.spec.csi.volumeHandle}' > /tmp/luks-test/$NAMESPACE/volumehandle
114114
115115
# Print the PV name and volume handle
116-
echo "PV Name: $(cat /tmp/luks-test/pvname)"
117-
echo "Volume Handle: $(cat /tmp/luks-test/volumehandle)"
116+
echo "PV Name: $(cat /tmp/luks-test/$NAMESPACE/pvname)"
117+
echo "Volume Handle: $(cat /tmp/luks-test/$NAMESPACE/volumehandle)"
118118
check:
119119
($error): ~
120120
- name: Delete the Pod
@@ -152,9 +152,12 @@ spec:
152152
- name: Delete PV
153153
try:
154154
- script:
155+
env:
156+
- name: NAMESPACE
157+
value: ($namespace)
155158
content: |
156159
set -e
157-
kubectl delete pv $(cat /tmp/luks-test/pvname)
160+
kubectl delete pv $(cat /tmp/luks-test/$NAMESPACE/pvname)
158161
check:
159162
($error): ~
160163
- name: Recreate PV
@@ -165,8 +168,8 @@ spec:
165168
value: ($namespace)
166169
content: |
167170
set -e
168-
PV_NAME=$(cat /tmp/luks-test/pvname)
169-
VOLUME_HANDLE=$(cat /tmp/luks-test/volumehandle)
171+
PV_NAME=$(cat /tmp/luks-test/$NAMESPACE/pvname)
172+
VOLUME_HANDLE=$(cat /tmp/luks-test/$NAMESPACE/volumehandle)
170173
171174
echo "PV Name: $PV_NAME"
172175
echo "Volume Handle: $VOLUME_HANDLE"
@@ -214,7 +217,7 @@ spec:
214217
value: ($namespace)
215218
content: |
216219
set -e
217-
PV_NAME=$(cat /tmp/luks-test/pvname)
220+
PV_NAME=$(cat /tmp/luks-test/$NAMESPACE/pvname)
218221
echo "PV Name: $PV_NAME"
219222
220223
# Add validation for captured values
@@ -284,7 +287,10 @@ spec:
284287
content: |
285288
set -e
286289
kubectl delete pvc -n $NAMESPACE pvc-filesystem-luks
287-
kubectl delete pv $(cat /tmp/luks-test/pvname)
290+
kubectl delete pv $(cat /tmp/luks-test/$NAMESPACE/pvname)
291+
292+
# Clean up temp directory
293+
rm -rf /tmp/luks-test/$NAMESPACE
288294
check:
289295
($error): ~
290296
- script:
@@ -316,9 +322,6 @@ spec:
316322
else
317323
echo "No volume found with tag filter: $FILTER"
318324
fi
319-
320-
# Clean up temp directory
321-
rm -rf /tmp/luks-test
322325
check:
323326
($error): ~
324327
(contains($stdout, 'Volume deletion initiated')): true

0 commit comments

Comments
 (0)