Tests: use matrix to set sqlite config for syntax and doc tests

Instead of doing the same thing in test.sh.
rcarpa · Oct 12, 2023 · d61c1b1 · d61c1b1
1 parent 8d065cb
commit d61c1b1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/etc/docker/dev/rucio_entrypoint.sh b/etc/docker/dev/rucio_entrypoint.sh
@@ -19,7 +19,7 @@ if [ -z "$RUCIO_HOME" ]; then
     RUCIO_HOME=/opt/rucio
 fi
 
-mkdir -p $RUCIO_HOME
+mkdir -p "$RUCIO_HOME/etc"
 
 generate_rucio_cfg(){
   	local override=$1

diff --git a/etc/docker/test/extra/rucio_syntax.cfg b/etc/docker/test/extra/rucio_syntax.cfg
diff --git a/etc/docker/test/matrix.yml b/etc/docker/test/matrix.yml
@@ -29,8 +29,12 @@ suites:
   - id: syntax
     SYNTAX_REPORT: 1
     RUN_HTTPD: false
+    RDBMS:
+      - sqlite
   - id: docs
     RUN_HTTPD: false
+    RDBMS:
+      - sqlite
   - id: client_syntax
     RUN_HTTPD: false
   - id: client

diff --git a/etc/docker/test/matrix_nightly.yml b/etc/docker/test/matrix_nightly.yml
@@ -14,8 +14,12 @@ suites:
   - id: syntax
     SYNTAX_REPORT: 1
     RUN_HTTPD: false
+    RDBMS:
+      - sqlite
   - id: docs
     RUN_HTTPD: false
+    RDBMS:
+      - sqlite
   - id: client_syntax
     RUN_HTTPD: false
   - id: client

diff --git a/tools/merge_rucio_configs.py b/tools/merge_rucio_configs.py
@@ -130,6 +130,7 @@ def merge_configs(source_file_paths, dest_file_path, use_env=True, logger=loggin
         logger(logging.INFO, "Merged {} configuration values from ENV".format(config_len(env_config)))
 
     if dest_file_path:
+        logger(logging.INFO, "Writing {}".format(dest_file_path))
         with open(dest_file_path, 'w') as dest_file:
             parser.write(dest_file)
     else:

diff --git a/tools/test/test.sh b/tools/test/test.sh
@@ -27,11 +27,6 @@ if [ "$SUITE" == "client" ] || [ "$SUITE" == "client_syntax" ]; then
     cd $SOURCE_PATH
     cp etc/docker/test/extra/rucio_client.cfg etc/rucio.cfg
 
-elif [ "$SUITE" == "syntax" ] || [ "$SUITE" == "docs" ]; then
-    python3 $SOURCE_PATH/tools/merge_rucio_configs.py --use-env \
-        -s "$CFG_PATH"/rucio_autotests_common.cfg "$CFG_PATH"/rucio_syntax.cfg \
-        -d "$SOURCE_PATH"/etc/rucio.cfg
-
 elif [ "$SUITE" == "votest" ]; then
     VOTEST_HELPER=$RUCIO_HOME/tools/test/votest_helper.py
     VOTEST_CONFIG_FILE=$RUCIO_HOME/etc/docker/test/matrix_policy_package_tests.yml