fix (diracx): integration tests do not use conversion yaml anymore

chaen · Jan 23, 2024 · 3ad9a0d · 3ad9a0d
1 parent 2c47327
commit 3ad9a0d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/tests/CI/exportCSLoop.sh b/tests/CI/exportCSLoop.sh
@@ -19,7 +19,6 @@ curl -L https://raw.githubusercontent.com/DIRACGrid/diracx/main/diracx-cli/tests
 while true; do
     DIRAC_COMPAT_ENABLE_CS_CONVERSION=x dirac internal legacy cs-sync \
         "$DIRACOS/etc/Production.cfg" \
-        /home/dirac/TestCode/diracx/tests/cli/legacy/cs_sync/convert_integration_test.yaml \
         /cs_store/initialRepo/default.yml
     git --git-dir=.git -C /cs_store/initialRepo/ commit -am "export $(date)"
     if [[ "${1}" == "--once" ]]; then

diff --git a/tests/Jenkins/dirac-cfg-setup-diracx.py b/tests/Jenkins/dirac-cfg-setup-diracx.py
@@ -2,6 +2,8 @@
 import argparse
 import os
 
+from diraccfg import CFG
+
 import DIRAC
 from DIRAC.Core.Utilities.ReturnValues import returnValueOrRaise
 
@@ -36,6 +38,39 @@ def main(url: str, disabled_vos: list[str]):
     if disabled_vos:
         returnValueOrRaise(csAPI.setOption("DiracX/DisabledVOs", ",".join(disabled_vos)))
 
+    csSync = {
+        "CsSync": {
+            "VOs": {
+                "Jenkins": {
+                    "DefaultGroup": "jenkins_user",
+                    "IdP": {"ClientID": "995ed3b9-d5bd-49d3-a7f4-7fc7dbd5a0cd", "URL": "https://jenkins.invalid/"},
+                    "UserSubjects": {
+                        "adminusername": "e2cb28ec-1a1e-40ee-a56d-d899b79879ce",
+                        "ciuser": "26dbe36e-cf5c-4c52-a834-29a1c904ef74",
+                        "trialUser": "a95ab678-3fa4-41b9-b863-fe62ce8064ce",
+                    },
+                    "Support": {
+                        "Message": "Contact the help desk",
+                        "Email": "helpdesk@example.invalid",
+                        "Webpage": "https://helpdesk.vo.invalid",
+                    },
+                },
+                "vo": {
+                    "DefaultGroup": "dirac_user",
+                    "IdP": {"ClientID": "072afab5-ed92-46e0-a61d-4ecbc96e0770", "URL": "https://vo.invalid/"},
+                    "UserSubjects": {
+                        "adminusername": "26b14fc9-6d40-4ca5-b014-6234eaf0fb6e",
+                        "ciuser": "d3adc733-6588-4d6f-8581-5986b02d0c87",
+                        "trialUser": "ff2152ff-34f4-4739-b106-3def37e291e3",
+                    },
+                },
+            }
+        }
+    }
+
+    csSyncCFG = CFG().loadFromDict(csSync)
+    returnValueOrRaise(csAPI.mergeCFGUnderSection("/DiracX/", csSyncCFG))
+
     returnValueOrRaise(csAPI.commit())