Skip to content
Snippets Groups Projects
Commit ba934d30 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

First tests with Rocky Linux 9 and Python 3.12.

parent fb2329e0
No related branches found
No related tags found
No related merge requests found
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# #
# Use Rocky Linux 8.9 minimal as base image # Use Rocky Linux 9.3 minimal as base image
FROM rockylinux:8.9-minimal FROM rockylinux:9.3-minimal
# Install epel repo, make, nano, openssh, wget, rsync, cronie, pip # Install epel repo, make, nano, openssh, iputils, wget, rsync, cronie, pip
RUN microdnf -y install epel-release make nano openssh-clients wget rsync cronie python3.11-pip RUN microdnf -y install epel-release make nano openssh-clients iputils wget rsync cronie python3.12-pip
# Install redis, psycopg2, paramiko, scp, tabulate Python packages # Install redis, psycopg2, paramiko, scp, tabulate Python packages
RUN pip3.11 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate RUN pip3.12 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# #
# Use python 3.11.7-slim as base image # Use python 3.12.9-slim as base image
FROM python:3.11.7-slim FROM python:3.12.9-slim
# Install psql client to be able to connect manually to the file_catalog container # Install psql client to be able to connect manually to the file_catalog container
# Install also redis-tools to be able to access the redis container via redis-cli # Install also redis-tools to be able to access the redis container via redis-cli
...@@ -50,4 +50,4 @@ RUN echo ". /usr/share/bash-completion/completions/vos_data" >> .bashrc && \ ...@@ -50,4 +50,4 @@ RUN echo ". /usr/share/bash-completion/completions/vos_data" >> .bashrc && \
echo ". /usr/share/bash-completion/completions/vos_storage" >> .bashrc echo ". /usr/share/bash-completion/completions/vos_storage" >> .bashrc
# Install python dependencies # Install python dependencies
RUN pip3.11 install --no-cache-dir redis hiredis tabulate RUN pip3.12 install --no-cache-dir redis hiredis tabulate
...@@ -15,4 +15,4 @@ do ...@@ -15,4 +15,4 @@ do
chmod -R 755 /mnt/hot_storage/users/${user} chmod -R 755 /mnt/hot_storage/users/${user}
done done
crond && /usr/bin/python3.11 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log crond && /usr/bin/python3.12 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log
...@@ -184,7 +184,7 @@ class TapeClient(object): ...@@ -184,7 +184,7 @@ class TapeClient(object):
""" """
self.logger.info("Starting RECALL_CHECKSUM operation...") self.logger.info("Starting RECALL_CHECKSUM operation...")
checksumFileList = f"vos_recall_checksum_files-{jobId}.lst" checksumFileList = f"vos_recall_checksum_files-{jobId}.lst"
cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1" cmd = f"find $(dirname {dirName}) -type f \\( -iname \"*-md5sum.txt\" \\) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1"
try: try:
stdin, stdout, stderr = self.client.exec_command(cmd) stdin, stdout, stderr = self.client.exec_command(cmd)
except Exception: except Exception:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment