Merge branch 'ci_changes' into 'main'

Postgres CI Changes

See merge request astrogeology/autocnet!656

.gitlab-ci.yml

-image: condaforge/mambaforge:latest
+image: code.usgs.gov:5001/astrogeology/autocnet/mambaforge
 
 services:
     - name: code.usgs.gov:5001/astrogeology/autocnet/postgis
@@ -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 .

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': ''},