Commit d75befcf authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch 'dev' into 'main' 

Merge 'dev' into 'main'

See merge request !136
parents 424c68aa 80ab33dc

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -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:

lib/galaxy/objectstore/rucio.py

+4 −0
Original line number Diff line number Diff line
@@ -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