Simplify the test.sh script to use a test-run-props files

Store the test-run-props.xml using another name

.github/workflows/docker-mozjs-image.yml

@@ -60,7 +60,7 @@ jobs:
     - name: Build TeamEngine and the ETS for OGC API - Processes and add it to the docker-compose
       run: docker/ets-ogcapi-processes/build.sh && cat docker/ets-ogcapi-processes/docker-compose-ets-part.yml >> docker-compose.yml
     - name: Start the test env
-      run: mkdir docker/tmp; chmod 777 -R docker ; echo "force "; sed "s=#- ./zoo-project/zoo-services/echo-py/cgi-env=- ./zoo-project/zoo-services/echo-py/cgi-env=g" -i docker-compose.yml ; docker-compose up -d
+      run: mkdir docker/tmp; chmod 777 -R docker ; echo "force deployment of org.n52.javaps.test.EchoProcess process" && sed "s=#- ./zoo-project/zoo-services/echo-py/cgi-env=- ./zoo-project/zoo-services/echo-py/cgi-env=g" -i docker-compose.yml && docker-compose up -d
     - name: Install required package
       run: docker exec zoo-project_zookernel_1 /bin/bash -c "apt-get update ; DEBIAN_FRONTEND=noninteractive apt-get -y install lynx;"
     - name: Run the ETS for OGC API - Processes (see test-run-props.xml for settings)

docker/ets-ogcapi-processes/docker-compose-ets-part.yml

@@ -1,7 +1,8 @@
   teamengine:
     image: zooproject/ets-ogcapi-processes10:latest
     volumes:
-      - ./docker/ets-ogcapi-processes/test-run-props.xml:/root/test-run-props.xml
+      - ./docker/ets-ogcapi-processes/test-run-ogcapi-processes-1.xml:/root/test-run-ogcapi-processes-1.xml
+      - ./docker/ets-ogcapi-processes/test-run-wps20.xml:/root/test-run-wps20.xml
       - ./docker/ets-ogcapi-processes/src1/ets-ogcapi-processes10/src/main/config/teamengine/config.xml:/root/teamengine/config.xml
       - ./docker/ets-ogcapi-processes/test.sh:/root/test.sh
     ports:

docker/ets-ogcapi-processes/test-run-wps20.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties version="1.0">
+    <comment>WPS 2.0 Sample Test Run Arguments</comment>
+    <entry key="IUT">http://zookernel/cgi-bin/zoo_loader.cgi</entry>
+    <!-- BEGIN OF ARGUMENTS DEFINITION -->
+    <entry key="SERVICE_URL">http://zookernel/cgi-bin/zoo_loader.cgi</entry>
+    <entry key="ECHO_PROCESS_ID">echo</entry>
+    <!-- END OF ARGUMENTS DEFINITION -->
+</properties>

docker/ets-ogcapi-processes/test.sh

@@ -23,25 +23,13 @@
 # THE SOFTWARE.
 #
 
-java -jar $(find /root -name "ets-ogcapi-processes10-*aio.jar") -o /tmp /root/test-run-props.xml
+java -jar $(find /root -name "ets-ogcapi-processes10-*aio.jar") -o /tmp /root/test-run-ogcapi-processes-1.xml
 cat $(find /tmp -name "*results.xml")
 echo Success: $(grep PASS $(find /tmp -name "*results.xml") | wc -l)
 echo Failed: $(grep FAIL $(find /tmp -name "*results.xml") | grep -v FAILURE | wc -l)
 
-echo '<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
-    <comment>WPS 2.0 Sample Test Run Arguments</comment>
-    <entry key="IUT">http://zookernel/cgi-bin/zoo_loader.cgi</entry>
-    <!-- BEGIN OF ARGUMENTS DEFINITION -->
-    <entry key="SERVICE_URL">http://zookernel/cgi-bin/zoo_loader.cgi</entry>
-    <entry key="ECHO_PROCESS_ID">echo</entry>
-    <!-- END OF ARGUMENTS DEFINITION -->
-</properties>
-' >  /root/test-run-props1.xml
-
 mkdir /tmp/tmp
-java -jar $(find /root -name "ets-wps20-*aio.jar") -o /tmp/tmp /root/test-run-props1.xml
+java -jar $(find /root -name "ets-wps20-*aio.jar") -o /tmp/tmp /root/test-run-wps20.xml
 cat $(find /tmp/tmp -name "*results.xml")
-echo Success: $(grep PASS $(find /tmp -name "*results.xml") | wc -l)
-echo Failed: $(grep FAIL $(find /tmp -name "*results.xml") | grep -v FAILURE | wc -l)
+echo Success: $(grep PASS $(find /tmp/tmp -name "*results.xml") | wc -l)
+echo Failed: $(grep FAIL $(find /tmp/tmp -name "*results.xml") | grep -v FAILURE | wc -l)