Run CITE GeoTIFF tests

Author: aaime

.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, wms13, wfs10, wfs11, wfs20, wcs11]
+        suite: [ogcapi-features10, wms11, wms13, wfs10, wfs11, wfs20, wcs11, geotiff11]
 
     steps:
       - name: Checkout repository (shallow clone)

build/cite/Makefile

@@ -75,7 +75,7 @@ ifndef suite
 	@$(MAKE) help
 	@exit 1
 endif
-ifneq (,$(filter $(suite),ogcapi-features10 wms11 wms13 wfs10 wfs20 wcs11))
+ifneq (,$(filter $(suite),ogcapi-features10 wms11 wms13 wfs10 wfs20 wcs11 geotiff11))
 	@$(MAKE) test-rest suite=$(suite)
 else
 	@$(MAKE) test-cli suite=$(suite)
@@ -239,6 +239,23 @@ validate-rest-results: $(suite)
     elif [ -f "logs/xml-results.xml" ]; then \
 		./xml-results-report.sh logs/xml-results.xml; \
 		./xml-results-validate.sh logs/xml-results.xml; \
+    else \
+        @result=0; \
+        for file in logs/*-results.xml; do \
+        if [ -f "$$file" ]; then \
+            case "$$file" in \
+            *testng-results.xml) \
+                ./testng-results-report.sh "$$file"; \
+                ./testng-results-validate.sh "$$file" || result=1; \
+                ;; \
+            *xml-results.xml) \
+                ./xml-results-report.sh "$$file"; \
+                ./xml-results-validate.sh "$$file" || result=1; \
+                ;; \
+            esac; \
+        fi; \
+        done; \
+        exit $$result; \
     fi
 
 .PHONY: print-full-failures

build/cite/geotiff11/compose.override.yml

@@ -0,0 +1,16 @@
+services:
+  geoserver:
+    image: ogccite/geoserver:geotiff11
+    build:
+      args:
+        # The WCS 1.1 data directory has a variety of raster data sources
+        GEOSERVER_DATA_DIR_SRC: "./wcs11/citewcs-1.1"
+
+  teamengine:
+    image: ogccite/teamengine-production
+    healthcheck:
+      test: "curl -f http://localhost:8080/teamengine/ || exit 1"
+      interval: 15s
+      timeout: 10s
+      retries: 10
+      start_period: 5s

build/cite/run-test.sh

@@ -112,10 +112,36 @@ ogcapi-features10() {
     run_rest_test_suite "ogcapi-features-1.0" "testng" "iut=http://geoserver:8080/geoserver/ogc/features/v1" "noofcollections=-1"
 }
 
+geotiff11() {
+  # RGB WMS
+  run_rest_test_suite_prefix "geotiff11" "01-wms-" "testng" "iut=http:%2F%2Fgeoserver:8080%2Fgeoserver%2Fwms?service%3DWMS%26version%3D1.1.0%26request%3DGetMap%26layers%3Dtopp%3Atazbm%26bbox%3D146.49999999999477%2C-44.49999999999785%2C147.99999999999474%2C-42.99999999999787%26width%3D767%26height%3D768%26srs%3DEPSG%3A4326%26styles%3D%26format%3Dimage%2Fgeotiff"
+
+  # single band WCS
+  run_rest_test_suite_prefix "geotiff11" "02-wcs-dem-basic-" "testng" "iut=http%3A%2F%2Fgeoserver%3A8080%2Fgeoserver%2Ftopp%2Fows%3Fservice%3DWCS%26version%3D2.0.1%26request%3DGetCoverage%26coverageId%3Dtopp__tazdem"
+
+  # single band rotated
+  run_rest_test_suite_prefix "geotiff11" "03-wcs-rotated-" "testng" "iut=http%3A%2F%2Fgeoserver%3A8080%2Fgeoserver%2Ftopp%2Fows%3Fservice%3DWCS%26version%3D2.0.1%26request%3DGetCoverage%26coverageId%3Dtopp__rotated"
+
+  # single band, deflate compressed, tiled, WCS
+  run_rest_test_suite_prefix "geotiff11" "04-wcs-dem-deflate-tiled-" "testng" "iut=http%3A%2F%2Fgeoserver%3A8080%2Fgeoserver%2Ftopp%2Fows%3Fservice%3DWCS%26version%3D2.0.1%26request%3DGetCoverage%26coverageId%3Dtopp__tazdem%26compression%3DDeflate%26tiling%3Dtrue%26tileheight%3D256%26tilewidth%3D256"
+
+  # three band, JPEG compressed, small tiles, WCS
+  run_rest_test_suite_prefix "geotiff11" "05-wcs-dem-jpeg-tinytiles-" "testng" "iut=http%3A%2F%2Fgeoserver%3A8080%2Fgeoserver%2Ftopp%2Fows%3Fservice%3DWCS%26version%3D2.0.1%26request%3DGetCoverage%26coverageId%3Dtopp__tazbm%26compression%3DJPEG%26compression%3DJPEG%26jpeg_quality%3D75%26tiling%3Dtrue%26tileheight%3D32%26tilewidth%3D32"
+}
+
 run_rest_test_suite() {
+  local suite_name=$1
+  local format=$2
+  shift 2
+  run_rest_test_suite_prefix "$suite_name" "" "$format" "$@"
+}
+
+run_rest_test_suite_prefix() {
+    set +x
+
     local suite_name=$1
-    local targetfile="/logs/$2-results.xml"
-    shift 2
+    local targetfile="/logs/$2$3-results.xml"
+    shift 3
     local params=("$@")
 
     echo $0
@@ -134,7 +160,6 @@ run_rest_test_suite() {
     echo $testurl
     credentials="ogctest:ogctest"
 
-    set +x
 
     echo
     echo Running tests
@@ -149,6 +174,7 @@ run_rest_test_suite() {
     curl -v -s -u "$credentials" "$testurl" -H "Accept: application/xml" > $targetfile
 }
 
+
 interactive () {
     /usr/local/tomcat/bin/startup.sh
     while true; do sleep 100000; done