Merge pull request #46156 from pblottiere/pyogctest_ogcapif

Add OGC API Features 1.0 tests in CI

.ci/ogc/nginx.conf

@@ -13,7 +13,7 @@ server {
 		try_files $uri $uri/ =404;
 	}
 
-        location /qgisserver {
+        location /qgisserver_wms130 {
                 fastcgi_pass qgis-server:5555;
                 add_header Access-Control-Allow-Origin *;
                 add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,X-Requested-With';
@@ -29,4 +29,21 @@ server {
                 fastcgi_param   SERVER_NAME $server_addr;
                 fastcgi_param   QGIS_PROJECT_FILE /data/teamengine_wms_130.qgs;
         }
+
+        location /qgisserver_ogcapif {
+                fastcgi_pass qgis-server:5555;
+                add_header Access-Control-Allow-Origin *;
+                add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,X-Requested-With';
+                fastcgi_param   PATH_INFO $fastcgi_script_name;
+                fastcgi_param   REQUEST_METHOD $request_method;
+                fastcgi_param   QUERY_STRING $query_string;
+                fastcgi_param   CONTENT_TYPE $content_type;
+                fastcgi_param   CONTENT_LENGTH $content_length;
+                fastcgi_param   SERVER_PROTOCOL $server_protocol;
+                fastcgi_param   REQUEST_URI $request_uri;
+                fastcgi_param   HTTPS $https if_not_empty;
+                fastcgi_param   SERVER_PORT 80;
+                fastcgi_param   SERVER_NAME $server_addr;
+                fastcgi_param   QGIS_PROJECT_FILE /data/QGIS-Training-Data/exercise_data/qgis-server-tutorial-data/world.qgs;
+        }
 }

.github/workflows/ogc.yml

@@ -85,16 +85,21 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install python3-virtualenv virtualenv git
           git clone https://github.com/pblottiere/pyogctest
-          cd pyogctest && git checkout 1.0.4 && cd -
+          cd pyogctest && git checkout 1.1.0 && cd -
           virtualenv -p /usr/bin/python3 venv && source venv/bin/activate && pip install -e pyogctest/
 
-      - name: Extract WMS 1.3.0 dataset
+      - name: Run WMS 1.3.0 OGC tests
         run: |
           source venv/bin/activate && ./pyogctest/pyogctest.py -s wms130 -e
+          docker-compose -f .ci/ogc/docker-compose.yml up -d
+          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_wms130
+        env:
+          DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }}
 
-      - name: Run WMS 1.3.0 OGC tests
+      - name: Run OGC API Features 1.0 tests
         run: |
+          cd data && git clone https://github.com/qgis/QGIS-Training-Data && cd -
           docker-compose -f .ci/ogc/docker-compose.yml up -d
-          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver
+          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s ogcapif -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_ogcapif
         env:
           DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }}