From 2c1ddb4a3f3e4c13f5a339aa502923c2bf63cc44 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 4 Jan 2024 13:12:27 +0100 Subject: [PATCH] Setup bazel single compilation thread in release deb/rpm Signed-off-by: Jose Luis Rivero --- .../templates/release/deb/binarypkg_task.Dockerfile.em | 5 +++++ .../templates/release/rpm/binarypkg_task.Dockerfile.em | 5 +++++ .../snippet/setup_bazel_single_thread_builds.Dockerfile.em | 1 + 3 files changed, 11 insertions(+) create mode 100644 ros_buildfarm/templates/snippet/setup_bazel_single_thread_builds.Dockerfile.em diff --git a/ros_buildfarm/templates/release/deb/binarypkg_task.Dockerfile.em b/ros_buildfarm/templates/release/deb/binarypkg_task.Dockerfile.em index da24e7d8e..bbf1dd046 100644 --- a/ros_buildfarm/templates/release/deb/binarypkg_task.Dockerfile.em +++ b/ros_buildfarm/templates/release/deb/binarypkg_task.Dockerfile.em @@ -23,6 +23,11 @@ ENV DEBIAN_FRONTEND noninteractive timezone=timezone, ))@ +@(TEMPLATE( + 'snippet/setup_bazel_single_thread_builds.Dockerfile.em', + bazelrc_dir='/etc', +))@ + RUN useradd -u @uid -l -m buildfarm @(TEMPLATE( diff --git a/ros_buildfarm/templates/release/rpm/binarypkg_task.Dockerfile.em b/ros_buildfarm/templates/release/rpm/binarypkg_task.Dockerfile.em index 9d451fba9..dea29f553 100644 --- a/ros_buildfarm/templates/release/rpm/binarypkg_task.Dockerfile.em +++ b/ros_buildfarm/templates/release/rpm/binarypkg_task.Dockerfile.em @@ -26,6 +26,11 @@ RUN crb enable RUN @(package_manager) install -y dnf{,-command\(download\)} mock{,-{core-configs,scm}} python@(python3_pkgversion){,-{catkin_pkg,empy,rosdistro,yaml}} +@(TEMPLATE( + 'snippet/setup_bazel_single_thread_builds.Dockerfile.em', + bazelrc_dir='/etc', +))@ + RUN useradd -u @(uid) -l -m buildfarm RUN usermod -a -G mock buildfarm diff --git a/ros_buildfarm/templates/snippet/setup_bazel_single_thread_builds.Dockerfile.em b/ros_buildfarm/templates/snippet/setup_bazel_single_thread_builds.Dockerfile.em new file mode 100644 index 000000000..1ef446be6 --- /dev/null +++ b/ros_buildfarm/templates/snippet/setup_bazel_single_thread_builds.Dockerfile.em @@ -0,0 +1 @@ +RUN echo 'build --jobs=1' >> @bazelrc_dir/bazel.bazelrc