WFS 1.1 tests running and passing

GeoCat · Nov 18, 2024 · b509070 · b509070
1 parent 034ed4e
commit b509070
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/cite.yml b/.github/workflows/cite.yml
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false  # Prevents other matrix jobs from being canceled if one fails
       matrix:
         #suite: [ogcapi-features10, wcs10, wcs11, wfs10, wfs11, wms10, wms11, wms13]
-        suite: [ogcapi-features10, wms11, wfs10, wcs11]
+        suite: [ogcapi-features10, wms11, wfs10, wfs11, wcs11]
 
     steps:
       - name: Checkout repository (shallow clone)

diff --git a/build/cite/wfs11/01-init-user.sh b/build/cite/wfs11/01-init-user.sh
@@ -2,7 +2,13 @@
 set -e
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE USER cite;
+    CREATE USER cite PASSWORD 'cite';
     CREATE DATABASE cite;
     GRANT ALL PRIVILEGES ON DATABASE cite TO cite;
 EOSQL
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "cite" <<-EOSQL
+    CREATE EXTENSION postgis;
+    GRANT ALL PRIVILEGES ON SCHEMA public TO cite;
+EOSQL
+
diff --git a/build/cite/wfs11/02-init-db.sql.gz b/build/cite/wfs11/02-init-db.sql.gz
diff --git a/build/cite/wfs11/citewfs-1.1/dataset-sf0-postgis2.sql b/build/cite/wfs11/citewfs-1.1/dataset-sf0-postgis2.sql
@@ -3,7 +3,9 @@
 --     psql -U <database owner> <database> < dataset-sf0.sql
 SET client_encoding = 'UTF8';
 
-drop table "PrimitiveGeoFeature";
+\connect cite cite
+
+--drop table "PrimitiveGeoFeature";
 create table "PrimitiveGeoFeature" ( 
     description varchar, 
     name varchar, 
@@ -26,7 +28,7 @@ INSERT INTO "PrimitiveGeoFeature" VALUES ('description-f008', 'name-f008',  ST_G
 INSERT INTO "PrimitiveGeoFeature" VALUES (NULL, 'name-f015',  NULL, ST_GeomFromText('POINT(-10.52 34.94)',4326), NULL, -900, NULL, 2.4, NULL, NULL, 7.90, 'f015');
 
 
-drop table "AggregateGeoFeature";
+--drop table "AggregateGeoFeature";
 create table "AggregateGeoFeature" ( 
     description varchar, 
     name varchar,
@@ -46,7 +48,7 @@ INSERT INTO "AggregateGeoFeature" VALUES ('description-f010','name-f010',NULL,NU
 INSERT INTO "AggregateGeoFeature" VALUES (NULL,'name-f016',NULL,NULL,ST_GeomFromText('MULTIPOLYGON(((6.0 57.5, 8.0 57.5, 8.0 60.0, 9.0 62.5, 5.0 62.5,6.0 60.0,6.0 57.5),(6.5 58.0,6.5 59.0,7.0 59.0,6.5 58.0)))',4326),-182.9,NULL,'In rhoncus nisl sit amet sem.','EE010','f016');
 
 
-drop table "EntitéGénérique";
+--drop table "EntitéGénérique";
 create table "EntitéGénérique" ( 
     description varchar, 
     name varchar,

diff --git a/build/cite/wfs11/compose.override.yml b/build/cite/wfs11/compose.override.yml
@@ -13,20 +13,16 @@ services:
     command: /run-test.sh wfs11
 
   postgres:
-    image: ogccite/postgres:wfs11
-    build:
-      context: .
-      dockerfile: ./postgres/Dockerfile
+    image: postgis/postgis:15-3.5-alpine
     ports:
-      - 5432
-    env_file:
-      - ./.env
-      - ./postgres/postgres.env
+      - 15432:5432
+    environment:
+      POSTGRES_DB: geoserver
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     volumes:
-    - pg_data:${PGDATA:-/var/lib/postgresql/data}:rw
     - ./wfs11/01-init-user.sh:/docker-entrypoint-initdb.d/01-init-user.sh
-    - ./wfs11/02-init-db.sql.gz:/docker-entrypoint-initdb.d/02-init-db.sql.gz
-    - ./wfs11/postgresql.conf:/etc/postgresql/postgresql.conf
+    - ./wfs11/citewfs-1.1/dataset-sf0-postgis2.sql:/docker-entrypoint-initdb.d/02-init-db.sql
 
 volumes:
   pg_data: