Skip to content

Commit 5a73421

Browse files
committed
fix DB env by using the wrappers of getodk/central#1671
1 parent 9108cb3 commit 5a73421

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ jobs:
6464
sed -i 's|\${BASE_URL}|http://${DOMAIN}|g' files/service/config.json.template
6565
sed -i 's/\$scheme/https/g' files/nginx/backend.conf
6666
sed 's/your.domain.com/central-test.localhost/; s/^SSL_TYPE=letsencrypt/SSL_TYPE=upstream/' .env.template > .env
67-
echo PGHOST=postgres14 >> .env
68-
echo PGUSER=odk >> .env
69-
echo PGPASSWORD=odk >> .env
70-
echo PGPORT=5432 >> .env
7167
- name: Add domain
7268
run: echo '127.0.0.1 central-test.localhost' | sudo tee --append /etc/hosts
7369
- name: Start services

e2e-tests/run-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ if [[ ${CI-} = true ]]; then
6666
wait-for-it "$ODK_DOMAIN:$ODK_PORT" --strict --timeout=60 -- echo '[e2e-tester] odk-central is UP!'
6767

6868
log "Creating test users..."
69-
docker compose exec service bash -c "echo '$ODK_PASSWORD' | node lib/bin/cli.js --email '$ODK_USER' user-create"
70-
docker compose exec service node lib/bin/cli.js --email "$ODK_USER" user-promote
69+
echo "$ODK_PASSWORD" | docker compose exec service odk-cmd --email "$ODK_USER" user-create
70+
docker compose exec service odk-cmd --email "$ODK_USER" user-promote
7171
log "Test user created."
7272
cd client
7373
fi

0 commit comments

Comments
 (0)