From 14846d8729c4c472c4584d8a03c56e5e38520cb8 Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Wed, 26 Nov 2025 16:06:03 -0500
Subject: [PATCH 1/3] Try to chmod the rucio.cfg file after creation

---
 lib/galaxy/objectstore/rucio.py | 4 ++++
 1 file changed, 4 insertions(+)

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


From edaf41b5b5261b7340bd3f3a223665ec19022512 Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Wed, 26 Nov 2025 16:15:34 -0500
Subject: [PATCH 2/3] Bump Galaxy version

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b43edd7602..113f03d4d8 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:
-- 
GitLab


From 3c3e2f8fdad0ff9e1d8742a6837b74b8a9efdf11 Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Wed, 26 Nov 2025 16:36:35 -0500
Subject: [PATCH 3/3] Run jest serially

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 113f03d4d8..b64b992b77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
-- 
GitLab