ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-02-26 05:59:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup error prints on bash startup script

Browse Source
This commit is contained in:
clearml 2025-02-24 13:42:37 +02:00
parent 8d3cb34390
commit 8887453328
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clearml_agent/commands/worker.py
View File

@ -1006,7 +1006,7 @@ class Worker(ServiceCommandSection):
docker_image, docker_image,
DockerArgsSanitizer.sanitize_docker_command(self._session, docker_arguments or []) DockerArgsSanitizer.sanitize_docker_command(self._session, docker_arguments or [])
) )
] + (['custom_setup_bash_script:\n{}'.format(docker_setup_script)] if docker_setup_script else []), ] + (['custom_setup_bash_script:\n{}\n'.format(docker_setup_script)] if docker_setup_script else []),
level="INFO", level="INFO",
session=task_session, session=task_session,
) )
@ -4630,16 +4630,16 @@ class Worker(ServiceCommandSection):
' libsm6 libxext6 libxrender-dev libglib2.0-0' if install_opencv_libs else ""), ' libsm6 libxext6 libxrender-dev libglib2.0-0' if install_opencv_libs else ""),
"cp -Rf {mount_ssh_ro} -T {mount_ssh}" if host_ssh_cache else "", "cp -Rf {mount_ssh_ro} -T {mount_ssh}" if host_ssh_cache else "",
"cp -Rf {mount_git_ro} -T ~/" if host_git_credentials else "", "cp -Rf {mount_git_ro} -T ~/" if host_git_credentials else "",
"[ ! -z $(which git || command -v git) ] || export CLEARML_APT_INSTALL=\"$CLEARML_APT_INSTALL git\"", "[ ! -z $(which git 2> /dev/null || command -v git) ] || export CLEARML_APT_INSTALL=\"$CLEARML_APT_INSTALL git\"",
"declare LOCAL_PYTHON", "declare LOCAL_PYTHON",
"[ ! -z $LOCAL_PYTHON ] || for i in {{20..5}}; do (which {python_single_digit}.$i || command -v {python_single_digit}.$i) && " + "[ ! -z $LOCAL_PYTHON ] || for i in {{20..5}}; do (which {python_single_digit}.$i 2> /dev/null || command -v {python_single_digit}.$i) && " +
"{python_single_digit}.$i -m pip --version && " + "{python_single_digit}.$i -m pip --version && " +
"export LOCAL_PYTHON=$(which {python_single_digit}.$i || command -v git) && break ; done", "export LOCAL_PYTHON=$(which {python_single_digit}.$i 2> /dev/null || command -v git) && break ; done",
"[ ! -z $LOCAL_PYTHON ] || export CLEARML_APT_INSTALL=\"$CLEARML_APT_INSTALL {python_single_digit}-pip\"", # noqa "[ ! -z $LOCAL_PYTHON ] || export CLEARML_APT_INSTALL=\"$CLEARML_APT_INSTALL {python_single_digit}-pip\"", # noqa
"[ -z \"$CLEARML_APT_INSTALL\" ] || " "[ -z \"$CLEARML_APT_INSTALL\" ] || "
"(apt-get update -y ; apt-get install -y $CLEARML_APT_INSTALL) || " "(apt-get update -y ; apt-get install -y $CLEARML_APT_INSTALL) || "
"(dnf install -y $CLEARML_APT_INSTALL)", "(dnf install -y $CLEARML_APT_INSTALL)",
"rm /usr/lib/python3.*/EXTERNALLY-MANAGED", # remove PEP 668 "rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED", # remove PEP 668
] ]
if preprocess_bash_script: if preprocess_bash_script:

6
clearml_agent/glue/k8s.py
View File

@ -85,12 +85,12 @@ class K8sIntegration(Worker):
for line in _CONTAINER_APT_SCRIPT_SECTION for line in _CONTAINER_APT_SCRIPT_SECTION
), ),
"declare LOCAL_PYTHON", "declare LOCAL_PYTHON",
"[ ! -z $LOCAL_PYTHON ] || for i in {{20..5}}; do (which python3.$i || command -v python3.$i) && python3.$i -m pip --version && " "[ ! -z $LOCAL_PYTHON ] || for i in {{20..5}}; do (which python3.$i 2> /dev/null || command -v python3.$i) && python3.$i -m pip --version && "
"export LOCAL_PYTHON=$(which python3.$i || command -v python3.$i) && break ; done", "export LOCAL_PYTHON=$(which python3.$i 2> /dev/null || command -v python3.$i) && break ; done",
'[ ! -z "$CLEARML_AGENT_SKIP_CONTAINER_APT" ] || [ ! -z "$LOCAL_PYTHON" ] || ' '[ ! -z "$CLEARML_AGENT_SKIP_CONTAINER_APT" ] || [ ! -z "$LOCAL_PYTHON" ] || '
'apt-get install -y python3-pip || dnf install -y python3-pip', 'apt-get install -y python3-pip || dnf install -y python3-pip',
"[ ! -z $LOCAL_PYTHON ] || export LOCAL_PYTHON=python3", "[ ! -z $LOCAL_PYTHON ] || export LOCAL_PYTHON=python3",
"rm /usr/lib/python3.*/EXTERNALLY-MANAGED", # remove PEP 668 "rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED", # remove PEP 668
"{extra_bash_init_cmd}", "{extra_bash_init_cmd}",
"[ ! -z $CLEARML_AGENT_NO_UPDATE ] || $LOCAL_PYTHON -m pip install clearml-agent{agent_install_args}", "[ ! -z $CLEARML_AGENT_NO_UPDATE ] || $LOCAL_PYTHON -m pip install clearml-agent{agent_install_args}",
"{extra_docker_bash_script}", "{extra_docker_bash_script}",