From 96259d7aee5dce9d880d2933ead4adbca15ae5aa Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Thu, 31 Oct 2024 12:43:52 +0100
Subject: [PATCH] TST: Tidy up test profile
---
test_profile/profile.yml | 98 +++-------------------------------------
1 file changed, 7 insertions(+), 91 deletions(-)
diff --git a/test_profile/profile.yml b/test_profile/profile.yml
index f2bb62d..6c0e62a 100644
--- a/test_profile/profile.yml
+++ b/test_profile/profile.yml
@@ -4,31 +4,11 @@ default:
# may be useful when other services shall be included, e.g. nginx or django.
# base_compose_file: "compose/docker-compose-default.yml"
- # Directories (list of strings) (or single directory (string, deprecated))
- # with customization files.
- # Directories listed later in the list take precedence over earlier ones.
- # If you change this, you need to include the full list of directories
- # (including possibly directories contained in the default setting).
- # custom:
- # Standard directory for customizations
- # - "./custom" # included by default
- # LinkAhead Theme for the web interface
- # - "./theme-linkahead" # included by default
- # - "./included_customization" # since this is later in the list this takes precedence
-
# Paths to be mounted into Docker, all entries are optional.
paths:
- # extroot: From where files are copied/symlinked. This is a
- # list of `NAME: PATH` pairs or a single path.
+ # Needed for file-exchange integration tests
extroot:
"": "paths/extroot"
- #
- # "base": "/path/to/base/dir"
- # "other": "/path/to/other"
- #
- # dropoffbox: (Soon to be deprecated.) Files can be written here, but note that you may need to
- # become root to remove this directory later. The corresponding server property is DROP_OFF_BOX.
- # dropoffbox: "/path/to/dropoffbox"
# Docker building configuration
# References can be either hashes of commits or branch names
@@ -44,20 +24,6 @@ default:
# Shall the SQL & caosroot dumps at custom/other/restore/ be used?
# restore: false
restore: true
- # uncomment to disable tls (ssl). This might be insecure!
- # no_tls: false
- # Shall the local users be imported as LinkAhead users?
- # local_users: false
- # Shall NIS be used for authentication?
- # nis: false
- # Shall LDAP be used for autentication? If `true`, an `nslcd.conf` with the
- # configuration for the LDAP client must exist at the profile's
- # `custom/other/` directory."
- # Shall a mail server be used?
- # mail: false
- # You can provide the path to an non-standard sendmail executable
- # sendmail: /usr/sbin/sendmail
- # sendmail: /usr/local/bin/sendmail_to_file
# Shall the server run in debug mode?
# This will bind-mount the following directories from custom into the Docker
# container:
@@ -81,27 +47,6 @@ default:
# The time zone for the server
# timezone: "Coordinated Universal Time"
- # You can set labels for the docker container here
- # labels:
- # label_1_key: label_1_value
- # label_2_key: label_2_value
-
- # User/Group of the server, either numeric or names.
- # user_group: 999:999
-
- # The user will be part of these additional groups
- # additional_groups:
- # - group1
- # - "11121"
-
- # Proxy settings. Will be entered in the corresponding environment
- # variables within the docker container. Defaults are null since
- # we need to distinguish from an empty string.
- # http_proxy: null
- # https_proxy: null
- # ftp_proxy: null
- # no_proxy: null
-
# Network settings.
network:
# The subnet for the Docker containers
@@ -141,7 +86,12 @@ default:
# uncomment to use the your custom authtoken config. See
# `conf/core/authtoken.example.yaml` for examples.
# Note: The path is relative to the caosdb server's root directory.
- # authtoken_config: conf/core/authtoken.yaml
+ authtoken_config: conf/core/authtoken.example.yaml
+
+ # Add an integration-test key which tells the server that
+ # tests using this key are allowed to, e.g., clear the
+ # database.
+ _CAOSDB_INTEGRATION_TEST_SUITE_KEY: "_CAOSDB_PYINTTEST_SUITE"
# HTTPS port of the grpc end-point
# grpc_server_port_https: 8443
@@ -154,37 +104,3 @@ default:
# Note that this is implemented by copying the file to
# custom/caosdb-server/target/, any file there will be overwritten.
# jar: /var/build/caosdb-server/0123abcd/target/caosdb-server-<version>-jar-with-dependencies.jar
-
- # The following is for the very specific case of server-side scripts
- # requiring additional Python packages that are not installed during
- # the regular build process of LinkAhead. If additional packages are
- # needed, list them below. Mind that only packages that can be
- # installed by pip are supported.
-
- # scripting:
- # packages:
-
- # Packages can be installed from PyPI or external git
- # repositories. In this case, `mode: "pip"` has to be
- # provided. `package` can be the package name in PyPI (possibly
- # with a version specification, i.e., `my_package>=1.0`, or it
- # can be the URL of a git repository of a Python
- # package. Essentially, the command `pip3 install
- # package_string` will be executed within LinkAhead.
-
- # <package1_key>:
- # mode: "pip"
- # package: "<package_string>"
-
- # Alternatively, local packages can be copied into LinkAhead and then be
- # installed using pip. Here, `mode: "copy"` has to be provided. `path`
- # specifies the path to the Python package on the host system (either
- # absolute or relative to the profile directory). `package` is the name of
- # the destination directory within the LinkAhead container into which the
- # local package will be copied. After copying, a `pip3 install .` is run
- # from within that directory.
-
- # <package2_key>:
- # mode: "copy"
- # path: "/path/to/local/python/package"
- # package: "<package_string>"
--
GitLab