cleanup for env-vars

This commit is contained in:
Michael Hoennig 2025-02-14 14:56:41 +01:00
parent a5a2fb89ab
commit c84198a05b
3 changed files with 8 additions and 10 deletions

View File

@ -113,9 +113,9 @@ function _gwTest1() {
echo "DONE gw $@" echo "DONE gw $@"
} }
function _gwTest() { function _gwTest() {
. .aliases; . .aliases
. .tc-environment; . .tc-environment
rm /tmp/gwTest.tmp rm -f /tmp/gwTest.tmp
if [ "$1" == "--all" ]; then if [ "$1" == "--all" ]; then
shift # to remove the --all from $@ shift # to remove the --all from $@
# delierately in separate gradlew-calls to avoid Testcontains-PostgreSQL problem spillover # delierately in separate gradlew-calls to avoid Testcontains-PostgreSQL problem spillover

View File

@ -3,7 +3,6 @@
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="env"> <option name="env">
<map> <map>
<entry key="HSADMINNG_MIGRATION_DATA_PATH" value="migration" />
<entry key="HSADMINNG_POSTGRES_ADMIN_USERNAME" value="admin" /> <entry key="HSADMINNG_POSTGRES_ADMIN_USERNAME" value="admin" />
<entry key="HSADMINNG_POSTGRES_RESTRICTED_USERNAME" value="restricted" /> <entry key="HSADMINNG_POSTGRES_RESTRICTED_USERNAME" value="restricted" />
<entry key="HSADMINNG_SUPERUSER" value="import-superuser@hostsharing.net" /> <entry key="HSADMINNG_SUPERUSER" value="import-superuser@hostsharing.net" />

View File

@ -1,8 +1,7 @@
unset HSADMINNG_POSTGRES_JDBC_URL # dynamically set, different for normal tests and imports source .unset-environment
export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
export HSADMINNG_POSTGRES_ADMIN_PASSWORD=
export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
export HSADMINNG_SUPERUSER=superuser-alex@hostsharing.net export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
export HSADMINNG_MIGRATION_DATA_PATH=migration export HSADMINNG_SUPERUSER=import-superuser@hostsharing.net
export HSADMINNG_OFFICE_DATA_SQL_FILE=
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8