diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10c81b54cf60f53d340bd2b7fac92ff7bf38afad..097d00021c1b1c487b0c1b9da686b44f06532e70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: condaforge/mambaforge:latest +image: code.usgs.gov:5001/astrogeology/autocnet/mambaforge services: - name: code.usgs.gov:5001/astrogeology/autocnet/postgis @@ -14,7 +14,7 @@ variables: stages: - test -unit-test-job: +unit-test-job: stage: test script: - mamba env create -f environment.yml -n autocnet_env @@ -27,5 +27,4 @@ unit-test-job: - psql -d template_postgis -U $POSTGRES_USER -h $POSTGRES_HOST -c 'GRANT ALL ON geometry_columns TO PUBLIC;'; - psql -d template_postgis -U $POSTGRES_USER -h $POSTGRES_HOST -c 'GRANT ALL ON geography_columns TO PUBLIC;'; - psql -d template_postgis -U $POSTGRES_USER -h $POSTGRES_HOST -c 'GRANT ALL ON spatial_ref_sys TO PUBLIC;'; - - ls /usr/lib/x86_64-linux-gnu/libGL.so.1 - - pytest . \ No newline at end of file + - pytest . diff --git a/conftest.py b/conftest.py index cbaa53fa574e3ac53fc2fa838e6cf62d6f7dbbe0..7cb4f02f9a7063c99121bbb1b789fe989adbb1ab 100644 --- a/conftest.py +++ b/conftest.py @@ -75,9 +75,9 @@ def default_configuration(): 'database': {'type': 'postgresql', 'username': 'postgres', 'password': 'NotTheDefault', - 'host': 'localhost', - 'port': 35432, - 'pgbouncer_port': 35432, + 'host': 'postgres', + 'port': 5432, + 'pgbouncer_port': 5432, 'name': 'travis_ci_test', 'timeout': 500}, 'pfeffernusse': {'url': ''},