From a84f6d059b2ccb73d944616a98e68d6f136afb7f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Mon, 28 Aug 2023 04:07:40 +0000 Subject: [PATCH] feat: remove resource_group (concurrency limiting) --- .gitlab-ci.yml | 3 +-- containers/jug/dev.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f68b81efd..9e07cc21a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: DOCKER_WAIT_TIME: 5 ## Number of jobs to start during container builds - JOBS: 128 + JOBS: 32 ## is this nightly or not? NIGHTLY: "" @@ -165,7 +165,6 @@ version: extends: .docker rules: - when: on_success - resource_group: ${CI_COMMIT_REF_NAME}-${VERSION} tags: - docker-new before_script: diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index f2d7a9fee..4af53eb8a 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -54,7 +54,7 @@ RUN declare -A target=( \ && spack config blame packages \ && spack config --scope user add "config:suppress_gpg_warnings:true" \ && spack config --scope user add "config:build_jobs:${jobs}" \ - && spack config --scope user add "config:db_lock_timeout:${jobs}0" \ + && spack config --scope user add "config:db_lock_timeout:${jobs}00" \ && spack config --scope user add "config:source_cache:/var/cache/spack" \ && spack config --scope user add "config:install_tree:root:/opt/software" \ && spack config --scope user add "config:ccache:true" \ -- GitLab