a

rcarpa · Jan 16, 2024 · 7af5f08 · 7af5f08
1 parent df4122c
commit 7af5f08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/etc/docker/dev/docker-compose.yml b/etc/docker/dev/docker-compose.yml
@@ -207,8 +207,6 @@ services:
       - XRDHOST=xrd4
       - XRDPORT=1097
     volumes:
-      - ./xrd/entrypoint.sh:/docker-entrypoint.sh:ro
-      - ./xrd:/configs:ro
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
       - ../../certs/hostcert_xrd4.pem:/tmp/xrdcert.pem:Z
       - ../../certs/hostcert_xrd4.key.pem:/tmp/xrdkey.pem:Z
@@ -217,7 +215,7 @@ services:
         soft: 10240
         hard: 10240
   xrd5:
-    image: rucio/xrootd
+    image: docker.io/rucio/xrootd
     profiles:
       - storage
     environment:

diff --git a/tests/test_conveyor.py b/tests/test_conveyor.py
@@ -1583,8 +1583,8 @@ def on_submit(file):
 @pytest.mark.parametrize("file_config_mock", [
     {"overrides": [('oidc', 'admin_issuer', 'indigoiam')]},
 ], indirect=True)
-@pytest.mark.parametrize("src_rse", ['XRD4', 'WEB1'])
-def test_transfer_with_tokens(vo, did_factory, root_account, caches_mock, file_config_mock, src_rse):
+def test_transfer_with_tokens(vo, did_factory, root_account, caches_mock, file_config_mock):
+    src_rse = 'WEB1'
     src_rse_id = rse_core.get_rse_id(rse=src_rse, vo=vo)
     dst_rse = 'XRD5'
     dst_rse_id = rse_core.get_rse_id(rse=dst_rse, vo=vo)

diff --git a/tools/docker_activate_rses.sh b/tools/docker_activate_rses.sh
@@ -48,8 +48,8 @@ rucio-admin rse add-protocol --hostname xrd1 --scheme root --prefix //rucio --po
 rucio-admin rse add-protocol --hostname xrd2 --scheme root --prefix //rucio --port 1095 --impl rucio.rse.protocols.xrootd.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' XRD2
 rucio-admin rse add-protocol --hostname xrd3 --scheme root --prefix //rucio --port 1096 --impl rucio.rse.protocols.xrootd.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' XRD3
 rucio-admin rse add-protocol --hostname xrd4 --scheme root --prefix //rucio --port 1097 --impl rucio.rse.protocols.xrootd.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' XRD4
-rucio-admin rse add-protocol --hostname xrd4 --scheme davs --prefix //rucio --port 1097 --impl rucio.rse.protocols.gfal.Default --domain-json '{"wan": {"read": 2, "write": 2, "delete": 2, "third_party_copy_read": 2, "third_party_copy_write": 2}, "lan": {"read": 2, "write": 2, "delete": 2}}' XRD4
-rucio-admin rse add-protocol --hostname xrd5 --scheme davs --prefix //rucio --port 1098 --impl rucio.rse.protocols.gfal.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' XRD5
+rucio-admin rse add-protocol --hostname xrd5 --scheme root --prefix //rucio --port 1098 --impl rucio.rse.protocols.xrootd.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' XRD5
+rucio-admin rse add-protocol --hostname xrd5 --scheme davs --prefix //rucio --port 1098 --impl rucio.rse.protocols.gfal.Default --domain-json '{"wan": {"read": 2, "write": 2, "delete": 2, "third_party_copy_read": 2, "third_party_copy_write": 2}, "lan": {"read": 2, "write": 2, "delete": 2}}' XRD5
 rucio-admin rse add-protocol --hostname ssh1 --scheme scp --prefix /rucio --port 22 --impl rucio.rse.protocols.ssh.Default --domain-json '{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}, "lan": {"read": 1, "write": 1, "delete": 1}}' SSH1
 rucio-admin rse add-protocol --hostname ssh1 --scheme rsync --prefix /rucio --port 22 --impl rucio.rse.protocols.ssh.Rsync --domain-json '{"wan": {"read": 2, "write": 2, "delete": 2, "third_party_copy_read": 2, "third_party_copy_write": 2}, "lan": {"read": 2, "write": 2, "delete": 2}}' SSH1
 rucio-admin rse add-protocol --hostname ssh1 --scheme rclone --prefix /rucio --port 22 --impl rucio.rse.protocols.rclone.Default --domain-json '{"wan": {"read": 3, "write": 3, "delete": 3, "third_party_copy_read": 3, "third_party_copy_write": 3}, "lan": {"read": 3, "write": 3, "delete": 3}}' SSH1
@@ -61,7 +61,6 @@ rucio-admin rse set-attribute --rse XRD2 --key test_container_xrd --value True
 rucio-admin rse set-attribute --rse XRD3 --key test_container_xrd --value True
 rucio-admin rse set-attribute --rse XRD4 --key test_container_xrd --value True
 rucio-admin rse set-attribute --rse SSH1 --key test_container_ssh --value True
-rucio-admin rse set-attribute --rse XRD4 --key oidc_support --value True
 rucio-admin rse set-attribute --rse XRD5 --key oidc_support --value True
 rucio-admin rse set-attribute --rse WEB1 --key oidc_support --value True
 rucio-admin rse set-attribute --rse WEB1 --key verify_checksum --value False