From 7b6e7af625f049728f4d6eb6d36917212eeeac1e Mon Sep 17 00:00:00 2001
From: "Duggan, John" <dugganjw@ornl.gov>
Date: Mon, 1 Dec 2025 15:29:21 +0000
Subject: [PATCH] Fix rucio.cfg file permissions

---
 .gitlab-ci.yml                  | 6 +++---
 lib/galaxy/objectstore/rucio.py | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b43edd7602..b64b992b77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ variables:
   CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}"
   CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"
   CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"
-  GALAXY_VERSION_PYTHON: 25.1.dev0+ornl
-  GALAXY_VERSION_DOCKER: 25.1.dev0.ornl
+  GALAXY_VERSION_PYTHON: 25.1.dev1+ornl
+  GALAXY_VERSION_DOCKER: 25.1.dev1.ornl
 
 # This import is for the func_rse_docker_* functions
 before_script:
@@ -47,7 +47,7 @@ client-tests:
       docker run
       --entrypoint=""
       $CONTAINER_GALAXY_COMMIT_URL:build-$CI_COMMIT_SHORT_SHA
-      bash -c ". .venv/bin/activate && cd client && yarn run jest"
+      bash -c ". .venv/bin/activate && cd client && yarn run jest --runInBand"
   tags:
     - rse-multi-builder
   except:
diff --git a/lib/galaxy/objectstore/rucio.py b/lib/galaxy/objectstore/rucio.py
index 420d63cdd4..c888b4da8f 100644
--- a/lib/galaxy/objectstore/rucio.py
+++ b/lib/galaxy/objectstore/rucio.py
@@ -176,6 +176,10 @@ username = {self.config['username']}
 {key_for_pass} = {self.config[key_for_pass]}
 """
                 )
+            try:
+                os.chmod(self.rucio_config_path, 0o666)
+            except OSError:
+                pass
         # We may have crossed a forkpool boundary. No harm setting the env var again.
         # Fixes rucio integration tests
         os.environ["RUCIO_CONFIG"] = self.rucio_config_path
-- 
GitLab