From 7307d401b36d380eeba621148a520df5a1b7ec3d Mon Sep 17 00:00:00 2001 From: Radu Carpa Date: Wed, 11 Oct 2023 11:34:36 +0200 Subject: [PATCH] Tests: factorize common rucio.cfg This also has the benefit of testing the tools/merge_rucio_configs.py script, which is critical for our containers, but is not tested anywhere. --- .../test/extra/rucio_autotests_common.cfg | 175 ++++++++++++++++++ .../extra/rucio_multi_vo_ts2_postgres14.cfg | 166 ----------------- .../extra/rucio_multi_vo_tst_postgres14.cfg | 166 ----------------- etc/docker/test/extra/rucio_mysql8.cfg | 174 ----------------- etc/docker/test/extra/rucio_oracle.cfg | 174 ----------------- etc/docker/test/extra/rucio_postgres14.cfg | 174 ----------------- etc/docker/test/extra/rucio_sqlite.cfg | 174 ----------------- etc/docker/test/extra/rucio_syntax.cfg | 172 +---------------- tools/test/before_script.sh | 36 +++- 9 files changed, 206 insertions(+), 1205 deletions(-) create mode 100644 etc/docker/test/extra/rucio_autotests_common.cfg diff --git a/etc/docker/test/extra/rucio_autotests_common.cfg b/etc/docker/test/extra/rucio_autotests_common.cfg new file mode 100644 index 00000000000..6da27404610 --- /dev/null +++ b/etc/docker/test/extra/rucio_autotests_common.cfg @@ -0,0 +1,175 @@ +[common] +logdir = /var/log/rucio +loglevel = DEBUG +mailtemplatedir=/opt/rucio/etc/mail_templates + +[client] +rucio_host = https://localhost:443 +auth_host = https://localhost:443 +auth_type = userpass +username = ddmlab +password = secret +ca_cert = /opt/rucio/etc/rucio_ca.pem +client_cert = /opt/rucio/etc/ruciouser.pem +client_key = /opt/rucio/etc/ruciouser.key.pem +client_x509_proxy = $X509_USER_PROXY +account = root +request_retries = 3 + +[database] +pool_recycle=3600 +echo=0 +pool_reset_on_return=rollback + +[bootstrap] +# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() +userpass_identity = ddmlab +userpass_pwd = secret +userpass_email = rucio-dev@cern.ch + +# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt +x509_identity = CN=Rucio User +x509_email = rucio-dev@cern.ch + +# Default DDMLAB cern account +gss_identity = rucio-dev@CERN.CH +gss_email = rucio-dev@cern.ch + +[monitor] +carbon_server = localhost +carbon_port = 8125 +user_scope = travis + +[conveyor] +scheme = srm,root,davs,gsiftp,http,https +transfertool = fts3 +ftshosts = https://fts:8446 +cacert = /opt/rucio/etc/rucio_ca.pem +usercert = /opt/rucio/etc/ruciouser.pem + +[messaging-fts3] +port = 61613 +nonssl_port = 61613 +use_ssl = False +ssl_key_file = /opt/rucio/etc/usercert.key.pem +ssl_cert_file = /opt/rucio/etc/usercert.pem +destination = /topic/transfer.fts_monitoring_complete +brokers = activemq +voname = atlas +username = receiver +password = supersecret + +[messaging-hermes] +username = admin +password = secret +port = 61613 +nonssl_port = 61613 +use_ssl = False +ssl_key_file = /opt/rucio/etc/usercert.key.pem +ssl_cert_file = /opt/rucio/etc/usercert.pem +destination = /topic/rucio.events +brokers = activemq +voname = atlas +email_from = Rucio +email_test = spamspamspam@cern.ch + +[transmogrifier] +maxdids = 100000 + +[accounts] +# These are accounts that can write into scopes owned by another account +special_accounts = panda, tier0 + +[trace] +tracedir = /var/log/rucio/trace +brokers=activemq +port=61013 +username = username +password = password +topic = /topic/rucio.tracer + +[tracer-kronos] +brokers=activemq +port=61013 +ssl_key_file = /opt/rucio/etc/usercert.key.pem +ssl_cert_file = /opt/rucio/etc/usercert.pem +queue = /queue/Consumer.kronos.rucio.tracer +prefetch_size = 10 +chunksize = 10 +subscription_id = rucio-tracer-listener +use_ssl = False +reconnect_attempts = 100 +excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch +username = username +password = password +dataset_wait = 60 + +[injector] +file = /opt/rucio/tools/test.file.1000 +bytes = 1000 +md5 = fd21ce524a9e45060fd3f62c4ef6a386 +adler32 = 52590737 + +[alembic] +cfg = /opt/rucio/etc/alembic.ini + +[messaging-cache] +port = 61023 +ssl_key_file = /opt/rucio/etc/usercert.key.pem +ssl_cert_file = /opt/rucio/etc/usercert.pem +destination = /topic/rucio.cache +brokers = activemq +voname = atlas +account = cache_mb + +[test] +cacert = /opt/rucio/etc/rucio_ca.pem +usercert = /opt/rucio/etc/ruciouser.pem +userkey = /opt/rucio/etc/ruciouser.key.pem + +[nagios] +proxy = /opt/rucio/etc/usercert.pem +rfcproxy = /opt/rucio/etc/usercert.pem +fts_servers = https://fts:8446 + +[auditor] +cache = /opt/rucio/auditor-cache +results = /opt/rucio/auditor-results + +[hermes] +email_from = Rucio +email_test = spamspamspam@cern.ch + +[c3po] +placement_algorithm = t2_free_space +elastic_url = http://elastic:9200 +redis_host = redis +redis_port = 6379 + +[c3po-popularity] +elastic_url = http://elastic:9200 + +[c3po-site-mapper] +panda_url = http://agis:80/request/pandaqueue/query/list/?json +ddm_url = http://agis:80/request/ddmendpoint/query/list/?json + +[c3po-workload] +panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running +window = 604800 + +[policy] +permission = atlas +schema = atlas +lfn2pfn_algorithm_default = hash +support = rucio-dev@cern.ch +support_rucio = https://github.com/rucio/rucio/issues/ + +[credentials] +gcs = /opt/rucio/etc/google-cloud-storage-test.json + +[oidc] +idpsecrets = /opt/rucio/etc/idpsecrets.json +admin_issuer = wlcg + +[api] +endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg b/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg index c586954447e..00cf87eb754 100644 --- a/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg +++ b/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg @@ -1,182 +1,16 @@ [common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates multi_vo = True [client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 # Relies on mapping created by bootstrap_tests.py vo = testvo2 [database] default = postgresql://rucio:rucio@postgres14/rucio schema = dev -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback pool_size = 20 max_overflow = 20 -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - [policy] permission = generic_multi_vo schema = generic_multi_vo -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg b/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg index 15dbf99804a..fac84d3a098 100644 --- a/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg +++ b/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg @@ -1,182 +1,16 @@ [common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates multi_vo = True [client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 # Relies on mapping created by bootstrap_tests.py vo = testvo1 [database] default = postgresql://rucio:rucio@postgres14/rucio schema = dev -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback pool_size = 20 max_overflow = 20 -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - [policy] permission = generic_multi_vo schema = generic_multi_vo -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_mysql8.cfg b/etc/docker/test/extra/rucio_mysql8.cfg index 00df6bf6313..f5fe31764c3 100644 --- a/etc/docker/test/extra/rucio_mysql8.cfg +++ b/etc/docker/test/extra/rucio_mysql8.cfg @@ -1,179 +1,5 @@ -[common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates - -[client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 - [database] default = mysql+pymysql://rucio:rucio@mysql8:3308/rucio schema=rucio -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback pool_size = 20 max_overflow = 20 - -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - -[policy] -permission = atlas -schema = atlas -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_oracle.cfg b/etc/docker/test/extra/rucio_oracle.cfg index 63ac281ba86..8d22586e220 100644 --- a/etc/docker/test/extra/rucio_oracle.cfg +++ b/etc/docker/test/extra/rucio_oracle.cfg @@ -1,179 +1,5 @@ -[common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates - -[client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 - [database] default = oracle://system:rucio@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=oracle)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=XE))) schema=system -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback pool_size = 20 max_overflow = 20 - -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - -[policy] -permission = atlas -schema = atlas -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_postgres14.cfg b/etc/docker/test/extra/rucio_postgres14.cfg index 6ac4b0d490c..9f791753ca8 100644 --- a/etc/docker/test/extra/rucio_postgres14.cfg +++ b/etc/docker/test/extra/rucio_postgres14.cfg @@ -1,179 +1,5 @@ -[common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates - -[client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 - [database] default = postgresql://rucio:rucio@postgres14/rucio schema=dev -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback pool_size = 20 max_overflow = 20 - -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - -[policy] -permission = atlas -schema = atlas -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_sqlite.cfg b/etc/docker/test/extra/rucio_sqlite.cfg index 41210741fab..740f86f113c 100644 --- a/etc/docker/test/extra/rucio_sqlite.cfg +++ b/etc/docker/test/extra/rucio_sqlite.cfg @@ -1,176 +1,2 @@ -[common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates - -[client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 - [database] default = sqlite:////tmp/rucio.db -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback - -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - -[policy] -permission = atlas -schema = atlas -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = /opt/rucio/etc/idpsecrets.json -admin_issuer = wlcg - -[api] -endpoints = accountlimits, accounts, archives, auth, config, credentials, dids, dirac, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, tmp_dids, traces, vos diff --git a/etc/docker/test/extra/rucio_syntax.cfg b/etc/docker/test/extra/rucio_syntax.cfg index 1d7c761bc3c..7e514f83517 100644 --- a/etc/docker/test/extra/rucio_syntax.cfg +++ b/etc/docker/test/extra/rucio_syntax.cfg @@ -1,172 +1,2 @@ -[common] -logdir = /var/log/rucio -loglevel = DEBUG -mailtemplatedir=/opt/rucio/etc/mail_templates - -[client] -rucio_host = https://localhost:443 -auth_host = https://localhost:443 -auth_type = userpass -username = ddmlab -password = secret -ca_cert = /opt/rucio/etc/rucio_ca.pem -client_cert = /opt/rucio/etc/ruciouser.pem -client_key = /opt/rucio/etc/ruciouser.key.pem -client_x509_proxy = $X509_USER_PROXY -account = root -request_retries = 3 - [database] -default = sqlite:////tmp/rucio.db -pool_recycle=3600 -echo=0 -pool_reset_on_return=rollback - -[bootstrap] -# Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() -userpass_identity = ddmlab -userpass_pwd = secret -userpass_email = rucio-dev@cern.ch - -# Default DDMLAB client certificate from /opt/rucio/etc/web/client.crt -x509_identity = CN=Rucio User -x509_email = rucio-dev@cern.ch - -# Default DDMLAB cern account -gss_identity = rucio-dev@CERN.CH -gss_email = rucio-dev@cern.ch - -[monitor] -carbon_server = localhost -carbon_port = 8125 -user_scope = travis - -[conveyor] -scheme = srm,root,davs,gsiftp,http,https -transfertool = fts3 -ftshosts = https://fts:8446 -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem - -[messaging-fts3] -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/transfer.fts_monitoring_complete -brokers = activemq -voname = atlas -username = receiver -password = supersecret - -[messaging-hermes] -username = admin -password = secret -port = 61613 -nonssl_port = 61613 -use_ssl = False -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.events -brokers = activemq -voname = atlas -email_from = Rucio -email_test = spamspamspam@cern.ch - -[transmogrifier] -maxdids = 100000 - -[accounts] -# These are accounts that can write into scopes owned by another account -special_accounts = panda, tier0 - -[trace] -tracedir = /var/log/rucio/trace -brokers=activemq -port=61013 -username = username -password = password -topic = /topic/rucio.tracer - -[tracer-kronos] -brokers=activemq -port=61013 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -queue = /queue/Consumer.kronos.rucio.tracer -prefetch_size = 10 -chunksize = 10 -subscription_id = rucio-tracer-listener -use_ssl = False -reconnect_attempts = 100 -excluded_usrdns = CN=proxy,CN=Robot: Ganga Robot,CN=722147,CN=gangarbt,OU=Users,OU=Organic Units,DC=cern,DC=ch -username = username -password = password -dataset_wait = 60 - -[injector] -file = /opt/rucio/tools/test.file.1000 -bytes = 1000 -md5 = fd21ce524a9e45060fd3f62c4ef6a386 -adler32 = 52590737 - -[alembic] -cfg = /opt/rucio/etc/alembic.ini - -[messaging-cache] -port = 61023 -ssl_key_file = /opt/rucio/etc/usercert.key.pem -ssl_cert_file = /opt/rucio/etc/usercert.pem -destination = /topic/rucio.cache -brokers = activemq -voname = atlas -account = cache_mb - -[test] -cacert = /opt/rucio/etc/rucio_ca.pem -usercert = /opt/rucio/etc/ruciouser.pem -userkey = /opt/rucio/etc/ruciouser.key.pem - -[nagios] -proxy = /opt/rucio/etc/usercert.pem -rfcproxy = /opt/rucio/etc/usercert.pem -fts_servers = https://fts:8446 - -[auditor] -cache = /opt/rucio/auditor-cache -results = /opt/rucio/auditor-results - -[hermes] -email_from = Rucio -email_test = spamspamspam@cern.ch - -[c3po] -placement_algorithm = t2_free_space -elastic_url = http://elastic:9200 -redis_host = redis -redis_port = 6379 - -[c3po-popularity] -elastic_url = http://elastic:9200 - -[c3po-site-mapper] -panda_url = http://agis:80/request/pandaqueue/query/list/?json -ddm_url = http://agis:80/request/ddmendpoint/query/list/?json - -[c3po-workload] -panda_url = http://bigpanda:80/jobs/?category=analysis&jobstatus=running -window = 604800 - -[policy] -permission = atlas -schema = atlas -lfn2pfn_algorithm_default = hash -support = rucio-dev@cern.ch -support_rucio = https://github.com/rucio/rucio/issues/ - -[credentials] -gcs = /opt/rucio/etc/google-cloud-storage-test.json - -[oidc] -idpsecrets = etc/idpsecrets.json +default = sqlite:////tmp/rucio.db \ No newline at end of file diff --git a/tools/test/before_script.sh b/tools/test/before_script.sh index cfa4e2c9ae3..f7433c864c1 100755 --- a/tools/test/before_script.sh +++ b/tools/test/before_script.sh @@ -45,7 +45,11 @@ if [ $RDBMS == "oracle" ]; then sleep 3 docker $CONTAINER_RUNTIME_ARGS exec $CON_DB /oracle_setup.sh sleep 3 - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_oracle.cfg /opt/rucio/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_oracle.cfg \ + --use-env \ + -d /opt/rucio/etc/rucio.cfg docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/alembic_oracle.ini /opt/rucio/etc/alembic.ini RESTART_HTTPD=1 @@ -61,7 +65,11 @@ elif [ $RDBMS == "mysql8" ]; then echo Could not connect to MySQL in time. exit 1 fi - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_mysql8.cfg /opt/rucio/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_mysql8.cfg \ + --use-env \ + -d /opt/rucio/etc/rucio.cfg docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/alembic_mysql8.ini /opt/rucio/etc/alembic.ini RESTART_HTTPD=1 @@ -80,15 +88,31 @@ elif [ $RDBMS == "postgres14" ]; then if [ $SUITE == "multi_vo" ]; then docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO mkdir -p /opt/rucio/etc/multi_vo/tst/etc docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO mkdir -p /opt/rucio/etc/multi_vo/ts2/etc - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg /opt/rucio/etc/multi_vo/tst/etc/rucio.cfg - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg /opt/rucio/etc/multi_vo/ts2/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_multi_vo_tst_postgres14.cfg \ + --use-env \ + -d /opt/rucio/etc/multi_vo/tst/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_multi_vo_ts2_postgres14.cfg \ + --use-env \ + -d /opt/rucio/etc/multi_vo/ts2/etc/rucio.cfg fi - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_postgres14.cfg /opt/rucio/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_postgres14.cfg \ + --use-env \ + -d /opt/rucio/etc/rucio.cfg docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/alembic_postgres14.ini /opt/rucio/etc/alembic.ini RESTART_HTTPD=1 elif [ $RDBMS == "sqlite" ]; then - docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/rucio_sqlite.cfg /opt/rucio/etc/rucio.cfg + docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO python3 tools/merge_rucio_configs.py \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_autotests_common.cfg \ + -s /usr/local/src/rucio/etc/docker/test/extra/rucio_sqlite.cfg \ + --use-env \ + -d /opt/rucio/etc/rucio.cfg docker $CONTAINER_RUNTIME_ARGS exec $CON_RUCIO cp /usr/local/src/rucio/etc/docker/test/extra/alembic_sqlite.ini /opt/rucio/etc/alembic.ini RESTART_HTTPD=1 fi