Use QJazz in tests

Author: dmarteau

.github/workflows/e2e_tests.yml

@@ -42,12 +42,12 @@ jobs:
           - name: "LEGACY"
             php: "8.1"
             pg-postgis: "14-3"
-            qgis-server: "3.34"
+            qgis-server: "qgis-ltr-eager"
             update-projects: "FALSE"
           - name: "BLEEDING_EDGE"
             php: "8.3"
             pg-postgis: "17-3"
-            qgis-server: "3.40"
+            qgis-server: "qgis-release-eager"
             update-projects: "TRUE"
     env:
       CYPRESS_CI: TRUE

tests/Makefile

@@ -62,7 +62,7 @@ show-qgis-server-versions:
 	docker run \
 	    -u $(LIZMAP_USER_ID):$(LIZMAP_GROUP_ID) \
 	    --rm -i \
-	    -e QGSRV_SERVER_PLUGINPATH=/srv/plugins \
+	    -e QGIS_PLUGINPATH=/srv/plugins \
 	    -e QGIS_PLUGIN_MANAGER_SKIP_SOURCES_FILE=True \
 	    -v $(shell pwd)/qgis-server-plugins:/srv/plugins \
 	    -v $(shell pwd)/:/src \
@@ -82,11 +82,11 @@ upgrade-projects:
 	    3liz/qjazz:${LZMQGSRVVERSION} \
 
 up: env
-	docker compose up  -V --force-recreate -d
+	docker compose --profile=swagger --profile=webdav up  -V --force-recreate -d
 
 stop:
-	docker compose stop
+	docker compose --profile=swagger --profile=webdav  stop
 
 reset:
-	docker compose down -v --remove-orphans
+	docker compose --profile=swagger --profile=webdav  down -v --remove-orphans
 	./lizmap-ctl clean

tests/docker-compose.yml

@@ -123,6 +123,8 @@ services:
       - { type: bind, source: ./api, target: /api }
     ports:
       - ${SWAGGER_PORT}:8080
+    profiles:
+      - swagger
 volumes:
   pg_data:
     name: "lizmap${LZMBRANCH}_pg_data"

tests/docker-conf/qgis-server.toml

@@ -36,5 +36,5 @@ route = "/"
 
 [[backends.root.api]]
 endpoint = "lizmap"
-name = "Lizmap api"
+name = "Lizmap"
 

tests/end2end/playwright.config.ts

@@ -4,7 +4,7 @@ export default defineConfig({
     testDir: './playwright',
     snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}',
     /* Maximum time one test can run for. */
-    timeout: 30 * 1000,
+    timeout: 10 * 1000,
     expect: {
         /**
          * Maximum time expect() should wait for the condition to be met.
@@ -17,7 +17,8 @@ export default defineConfig({
     /* Fail the build on CI if you accidentally left test.only in the source code. */
     forbidOnly: !!process.env.CI,
     /* Retry on CI only */
-    retries: process.env.CI ? 2 : 0,
+    /* retries: process.env.CI ? 2 : 0, */
+    retries: 0,
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 2 : undefined,
     /* Reporter to use.  */

tests/run-docker

@@ -18,7 +18,7 @@ if [ "$CMD" == "reset" ]; then
     exit 0
 elif [ "$CMD" == "build" ]; then
     # install or update base images, to be sure we have the latest images
-    docker compose pull
+    docker compose --profile=webdav --profile=swagger pull
 fi
 
-docker compose $CMD "$@"
+docker compose --profile=webdav --profile=swagger $CMD "$@"