From fad19dd8f28843d5ffb215351143fa6913daaa44 Mon Sep 17 00:00:00 2001 From: Andreas Hartmann Date: Tue, 31 Oct 2023 07:45:25 +0000 Subject: [PATCH 1/2] systemd: Remove task limit from user slices and set the default task limit to infinity. Previously, the task limit on the `user-*.slice` units was 675, which can become a problem in CI jobs that fork a lot, causing spurious CI failures. Signed-off-by: Andreas Hartmann --- etc/systemd/system.conf.d/{kmsglog.conf => 10-kmsglog.conf} | 0 etc/systemd/system.conf.d/20-tasklimit.conf | 2 ++ etc/systemd/system/user-.slice.d/20-tasklimit.conf | 2 ++ 3 files changed, 4 insertions(+) rename etc/systemd/system.conf.d/{kmsglog.conf => 10-kmsglog.conf} (100%) create mode 100644 etc/systemd/system.conf.d/20-tasklimit.conf create mode 100644 etc/systemd/system/user-.slice.d/20-tasklimit.conf diff --git a/etc/systemd/system.conf.d/kmsglog.conf b/etc/systemd/system.conf.d/10-kmsglog.conf similarity index 100% rename from etc/systemd/system.conf.d/kmsglog.conf rename to etc/systemd/system.conf.d/10-kmsglog.conf diff --git a/etc/systemd/system.conf.d/20-tasklimit.conf b/etc/systemd/system.conf.d/20-tasklimit.conf new file mode 100644 index 0000000..591341a --- /dev/null +++ b/etc/systemd/system.conf.d/20-tasklimit.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultTasksMax=infinity diff --git a/etc/systemd/system/user-.slice.d/20-tasklimit.conf b/etc/systemd/system/user-.slice.d/20-tasklimit.conf new file mode 100644 index 0000000..7bb86d5 --- /dev/null +++ b/etc/systemd/system/user-.slice.d/20-tasklimit.conf @@ -0,0 +1,2 @@ +[Slice] +TasksMax=infinity From e8d882cc13791187692ee20df25c30995ad16ffb Mon Sep 17 00:00:00 2001 From: Andreas Hartmann Date: Tue, 31 Oct 2023 07:52:30 +0000 Subject: [PATCH 2/2] ci: Use commit ref slug instead of branch name as default container tag name for uploading, because branch names can includes characters that aren't valid for tags (such as '/'). Signed-off-by: Andreas Hartmann --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d2c473..1d63bb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ build: script: # N/B: There could be more than one merge-request open with this branch's HEAD - | - IMAGE_TAG="${CI_COMMIT_BRANCH}"; + IMAGE_TAG="${CI_COMMIT_REF_SLUG}"; if [[ -n "$CI_COMMIT_TAG" ]]; then IMAGE_TAG="${CI_COMMIT_TAG}"; elif [[ -n "$CI_OPEN_MERGE_REQUESTS" ]]; then