From 22a6be9fdf1a2779abac7a39cdde4914a89039b1 Mon Sep 17 00:00:00 2001 From: Oksana Shadura Date: Wed, 29 May 2024 16:27:09 +0200 Subject: [PATCH 1/2] Fix typo in script --- docker/prepare-env/prepare-env-cc-analysis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/prepare-env/prepare-env-cc-analysis.sh b/docker/prepare-env/prepare-env-cc-analysis.sh index 49275602..186b4e36 100755 --- a/docker/prepare-env/prepare-env-cc-analysis.sh +++ b/docker/prepare-env/prepare-env-cc-analysis.sh @@ -139,7 +139,7 @@ if [[ ! -v COFFEA_CASA_SIDECAR ]]; then then CPUS=`cat $_CONDOR_JOB_AD | grep "DaskWorkerCores " | tr -d '"' | awk '{print $NF;}'` MEMORY=`cat $_CONDOR_JOB_AD | grep "RequestMemory " | tr -d '"' | awk '{print $NF;}'` - MEMORY_MB_FORMATTED=$MEMORY".00MB" + MEMORY_MB_FORMATTED=$MEMORY_PROVISIONED".00MB" # Dask worker command execurted in HTCondor pool. # Communication protocol: in Coffea-casa we use only secured communications (over TLS) @@ -149,7 +149,7 @@ if [[ ! -v COFFEA_CASA_SIDECAR ]]; then --tls-ca-file $PATH_CA_FILE \ --tls-cert $FILE_CERT \ --tls-key $FILE_KEY \ - --nthreads $CPUS_DASK \ + --nthreads $CPUS \ --memory-limit $MEMORY_MB_FORMATTED \ --nanny \ --death-timeout 60 \ From e87796af2b3c2e136d84a1ab598b593c643cf8fb Mon Sep 17 00:00:00 2001 From: Oksana Shadura Date: Wed, 29 May 2024 17:53:26 +0200 Subject: [PATCH 2/2] Add alma8 images --- .github/workflows/dockerci-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerci-dev.yml b/.github/workflows/dockerci-dev.yml index 80af2c32..bfaf84e9 100644 --- a/.github/workflows/dockerci-dev.yml +++ b/.github/workflows/dockerci-dev.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - image: [cc-base-ubuntu, cc-analysis-ubuntu, cc-base-centos7, cc-analysis-centos7] + image: [cc-base-ubuntu, cc-analysis-ubuntu, cc-base-alma8, cc-analysis-alma8] # Keep this line in sync with gh actions @ coffea-dask repo # python: [3.8, 3.9, '3.10'] #exclude: