Merge branch 'release-3.12' into release-3.12

CHANGELOG.md

@@ -5,9 +5,9 @@ CHANGELOG
 
 **ENHANCEMENTS**
 - Add new build image configuration section `Build/Installation` to turn on/off Nvidia software and Lustre client installations. By default, Nvidia software, although included in official ParallelCluster AMIs, is not installed by `build-image`. By default, Lustre client is installed.
+- The CLI commands `export-cluster-logs` and `export-image-logs` can now by default export the logs to the default ParallelCluster bucket or to the CustomS3Bucket if specified in the config.
 
 **CHANGES**
-- The CLI commands `export-cluster-logs` and `export-image-logs` can now by default export the logs to the default ParallelCluster bucket or to the CustomS3Bucket if specified in the config.
 - Upgrade Amazon DCV to version `2024.0-18131`.
   - server: `2024.0-18131-1`
   - xdcv: `2024.0.631-1`

tests/integration-tests/tests/pyxis/test_pyxis/test_pyxis/compute_node_start.sh

@@ -6,11 +6,14 @@ echo "Executing $0"
 # Configure Enroot
 ENROOT_PERSISTENT_DIR="/var/enroot"
 ENROOT_VOLATILE_DIR="/run/enroot"
+ENROOT_CONF_DIR="/etc/enroot"
 
 sudo mkdir -p $ENROOT_PERSISTENT_DIR
 sudo chmod 1777 $ENROOT_PERSISTENT_DIR
 sudo mkdir -p $ENROOT_VOLATILE_DIR
 sudo chmod 1777 $ENROOT_VOLATILE_DIR
+sudo mkdir -p $ENROOT_CONF_DIR
+sudo chmod 1777 $ENROOT_CONF_DIR
 sudo mv /opt/parallelcluster/examples/enroot/enroot.conf /etc/enroot/enroot.conf
 sudo chmod 0644 /etc/enroot/enroot.conf