Skip to content

Commit b69a9ac

Browse files
Updated tests to run in containers
1 parent 0da0920 commit b69a9ac

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
- master
66
- dev
77
- hotfix
8+
- test*
9+
paths-ignore:
10+
- '*.md'
11+
- VERSION
812
pull_request:
913
branches:
1014
- master

bin/setup_database

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ set -eu
66
: ${PSQL_USER:=linkspace}
77
: ${PSQL_PASSWORD:=linkspace}
88
: ${PSQL_DATABASE:=linkspace}
9+
: ${PSQL_HOST:=postgres}
910

1011
echo "
1112
CREATE USER ${PSQL_USER} WITH PASSWORD '${PSQL_PASSWORD}';
1213
CREATE DATABASE ${PSQL_DATABASE} OWNER ${PSQL_USER};
13-
" | psql -U postgres
14+
" | psql -U postgres -h ${PSQL_HOST}
1415
echo "
1516
CREATE EXTENSION IF NOT EXISTS citext WITH SCHEMA public;
16-
" | psql -U postgres ${PSQL_DATABASE}
17+
" | psql -U postgres -h ${PSQL_HOST} ${PSQL_DATABASE}
1718

1819
# Deploy the database
1920
perl bin/seed-database.pl \
@@ -33,4 +34,4 @@ fi
3334
echo "
3435
UPDATE public.site SET host = '${GADS_HOSTNAME}';
3536
UPDATE public.user SET account_request = 0, pwchanged = NOW(), created = NOW();
36-
" | psql -U postgres ${PSQL_DATABASE}
37+
" | psql -U postgres -h ${PSQL_HOST} ${PSQL_DATABASE}

webdriver/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins:
2323
session_messages: [ NOTICE, MISTAKE, ERROR, FAULT, ALERT, FAILURE, PANIC ]
2424
DBIC:
2525
default:
26-
dsn: dbi:Pg:database=linkspace
26+
dsn: dbi:Pg:database=linkspace;host=postgres
2727
schema_class: GADS::Schema
2828
user: linkspace
2929
password: linkspace

0 commit comments

Comments
 (0)