Fix pytest-rerunfailures installation by using apt instead of pip (#…

…1020) * Change installation of pytest-rerunfailures to use apt Signed-off-by: Cristóbal Arroyo <j.arroyo@uniandes.edu.co> * Initial commit * Remove os_code_name Signed-off-by: Cristóbal Arroyo <j.arroyo@uniandes.edu.co> --------- Signed-off-by: Cristóbal Arroyo <j.arroyo@uniandes.edu.co>
ros-infrastructure · Jan 31, 2024 · bf2bd68 · bf2bd68
1 parent 38030c1
commit bf2bd68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em
@@ -66,7 +66,11 @@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y git python
 RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y python3-pip
 @# colcon-core.package_identification.python needs at least setuptools 30.3.0
 @# pytest-rerunfailures enables usage of --retest-until-pass
-RUN pip3 install -U setuptools==59.6.0 pytest-rerunfailures
+@(TEMPLATE(
+    'snippet/install_pytest-rerunfailures.Dockerfile.em',
+    os_name=os_name,
+))@
+RUN pip3 install -U setuptools==59.6.0
 @[end if]@
 RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y ccache
 

diff --git a/ros_buildfarm/templates/snippet/install_pytest-rerunfailures.Dockerfile.em b/ros_buildfarm/templates/snippet/install_pytest-rerunfailures.Dockerfile.em
@@ -0,0 +1,4 @@
+@[if os_name == 'debian' or os_name == 'ubuntu']@
+@# python3-pytest-rerunfailures is supported since Ubuntu jammy
+RUN for i in 1 2 3; do apt-get update && apt-get install -q -y python3-pytest-rerunfailures && apt-get clean && break || if [ $i -lt 3 ]; then sleep 5; else false; fi; done
+@[end if]@