Skip to content

Commit 2db2aa7

Browse files
(MAINT) try /var/tmp again
1 parent 022c7a3 commit 2db2aa7

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/test-install-matrix.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
echo " transport: docker" >> ./inventory.yaml
110110
echo " docker:" >> ./inventory.yaml
111111
echo " container: ${container_info[0]}" >> ./inventory.yaml
112+
echo " tmpdir: /var/tmp" >> ./inventory.yaml
112113
# Replica
113114
echo " - name: ${container_info[1]}" >> ./inventory.yaml
114115
echo " uri: ${container_info[1]}" >> ./inventory.yaml
@@ -118,6 +119,7 @@ jobs:
118119
echo " transport: docker" >> ./inventory.yaml
119120
echo " docker:" >> ./inventory.yaml
120121
echo " container: ${container_info[1]}" >> ./inventory.yaml
122+
echo " tmpdir: /var/tmp" >> ./inventory.yaml
121123
fi
122124
;;
123125
# ... other architecture cases ...
@@ -301,10 +303,16 @@ jobs:
301303
docker exec $container chmod 1777 /tmp
302304
docker exec $container ls -ld /tmp
303305
306+
# Ensure /var/tmp exists with correct permissions
307+
echo "Creating and setting permissions for /var/tmp directory:"
308+
docker exec $container mkdir -p /var/tmp
309+
docker exec $container chmod 1777 /var/tmp
310+
docker exec $container ls -ld /var/tmp
311+
304312
# Create a test file to verify write permissions
305313
echo "Testing write permissions:"
306-
docker exec $container touch /tmp/test_write_permissions || echo "Failed to create test file"
307-
docker exec $container rm -f /tmp/test_write_permissions || echo "Failed to remove test file"
314+
docker exec $container touch /var/tmp/test_write_permissions || echo "Failed to create test file"
315+
docker exec $container rm -f /var/tmp/test_write_permissions || echo "Failed to remove test file"
308316
309317
# Ensure other required directories exist
310318
echo "Creating other required directories:"
@@ -325,7 +333,7 @@ jobs:
325333
326334
# Check available disk space
327335
echo "Disk space check:"
328-
docker exec $container df -h /tmp || echo "Cannot check disk space"
336+
docker exec $container df -h /var/tmp || echo "Cannot check disk space"
329337
330338
# Test pe_install.sh specific requirements
331339
echo "Testing pe_install.sh requirements:"

plans/subplans/install.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
Optional[String] $license_key_content = undef,
6767

6868
# Other
69-
String $stagingdir = '/tmp',
70-
String $uploaddir = '/tmp',
69+
String $stagingdir = '/var/tmp',
70+
String $uploaddir = '/var/tmp',
7171
Peadm::Download_mode $download_mode = 'bolthost',
7272
Boolean $permit_unsafe_versions = false,
7373
String $token_lifetime = '1y',

0 commit comments

Comments
 (0)