From 0866b61d544ba9b9fc2b0ea33319ab2b0422566d Mon Sep 17 00:00:00 2001 From: jlenain Date: Thu, 25 Jan 2024 22:19:09 +0100 Subject: [PATCH 1/2] Update DIRAC endpoints --- Singularity | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Singularity b/Singularity index fe5138bc..7eee798f 100644 --- a/Singularity +++ b/Singularity @@ -64,9 +64,11 @@ DIRAC { Servers = dips://dcta-servers03.pic.es:9135/Configuration/Server Servers += dips://dcta-agents03.pic.es:9135/Configuration/Server - Servers += dips://ccdcta-server04.in2p3.fr:9135/Configuration/Server - Servers += dips://ccdcta-server05.in2p3.fr:9135/Configuration/Server - Servers += dips://ccdcta-web01.in2p3.fr:9135/Configuration/Server + Servers += dips://ctadirac-01.cscs.cta-observatory.org:9135/Configuration/Server + Servers += dips://ctadirac-02.cscs.cta-observatory.org:9135/Configuration/Server + Servers += dips://ctadirac-03.cscs.cta-observatory.org:9135/Configuration/Server + Servers += dips://ctadirac-04.cscs.cta-observatory.org:9135/Configuration/Server + Servers += dips://ctadirac-05.cscs.cta-observatory.org:9135/Configuration/Server Servers += dips://cta-dirac.zeuthen.desy.de:9135/Configuration/Server } Security @@ -79,9 +81,11 @@ LocalInstallation Setup = CTA ConfigurationServer = dips://dcta-servers03.pic.es:9135/Configuration/Server ConfigurationServer += dips://dcta-agents03.pic.es:9135/Configuration/Server - ConfigurationServer += dips://ccdcta-server04.in2p3.fr:9135/Configuration/Server - ConfigurationServer += dips://ccdcta-server05.in2p3.fr:9135/Configuration/Server - ConfigurationServer += dips://ccdcta-web01.in2p3.fr:9135/Configuration/Server + ConfigurationServer += dips://ctadirac-01.cscs.cta-observatory.org:9135/Configuration/Server + ConfigurationServer += dips://ctadirac-02.cscs.cta-observatory.org:9135/Configuration/Server + ConfigurationServer += dips://ctadirac-03.cscs.cta-observatory.org:9135/Configuration/Server + ConfigurationServer += dips://ctadirac-04.cscs.cta-observatory.org:9135/Configuration/Server + ConfigurationServer += dips://ctadirac-05.cscs.cta-observatory.org:9135/Configuration/Server ConfigurationServer += dips://cta-dirac.zeuthen.desy.de:9135/Configuration/Server SkipCAChecks = True } From 4779e5b8d642b0ae71902c9e632e8a45591c4522 Mon Sep 17 00:00:00 2001 From: jlenain Date: Thu, 25 Jan 2024 22:20:30 +0100 Subject: [PATCH 2/2] COMDIRAC is not an explicit requirement anymore, and is now fully contained within DIRAC. This caused DIRAC to be pinned to version <= 7.* while we now need DIRAC 8.* for the last updated CTADIRAC version with recent endpoints when building our container. --- Singularity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Singularity b/Singularity index 7eee798f..0082346e 100644 --- a/Singularity +++ b/Singularity @@ -53,7 +53,7 @@ From: condaforge/mambaforge conda env config vars set X509_CERT_DIR=${CONDA_PREFIX}/etc/grid-security/certificates X509_VOMS_DIR=${CONDA_PREFIX}/etc/grid-security/vomsdir X509_VOMSES=${CONDA_PREFIX}/etc/grid-security/vomses mamba deactivate mamba activate nectarchain - pip install CTADIRAC COMDIRAC + pip install CTADIRAC # Since there is no proxy available at build time, manually configure the CTADIRAC client cat < ${CONDA_PREFIX}/etc/dirac.cfg