diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b43edd760241d36826f7b87459c0654812c1be0d..b64b992b77f0209548e8b8594b1992b8a309ea2a 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 420d63cdd481ed7c501271d8f663d7f16677cd57..c888b4da8ffe6bdc22542dc426c158f8ac94249b 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