WIP

somleng · Mar 29, 2024 · c391949 · c391949
1 parent f222094
commit c391949
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -131,6 +131,4 @@ jobs:
 
       - name: Run ${{ inputs.context }} Tests
         run: |
-          docker-compose run testing --no-TTY testing ls -lath
-          docker-compose run testing --no-TTY testing cat ./tests.sh
-          docker-compose run testing --no-TTY testing ./tests.sh ./tests/${{ inputs.context }}
+          docker-compose run -e UAS=true testing ./tests.sh ./tests/${{ inputs.context }}
diff --git a/components/testing/Dockerfile b/components/testing/Dockerfile
@@ -12,6 +12,7 @@ RUN cd /testing/support/ws_server && \
 EXPOSE 5060
 
 ENV WS_SERVER_PORT "3001"
+ENV FILE_SERVER_PORT "8000"
 
 ENTRYPOINT ["./docker-entrypoint.sh"]
-CMD ["start"]
+CMD ["services"]
diff --git a/components/testing/docker-entrypoint.sh b/components/testing/docker-entrypoint.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
-if [ "$1" = 'start' ]; then
+if [ -n "${UAS}" ]; then
+  sipp -sf ./scenarios/uas.xml -bg -trace_msg
+fi
+
+if [ "$1" = "services" ]; then
   WS_SERVER_PORT="${WS_SERVER_PORT:="3001"}"
-  HTTP_SERVER_PORT="${HTTP_SERVER_PORT:="8000"}"
+  FILE_SERVER_PORT="${FILE_SERVER_PORT:="8000"}"
 
-  sipp -sf ./scenarios/uas.xml -bg -trace_msg
   nohup node ./support/ws_server/test_server.js --port "$WS_SERVER_PORT" > test-server.log &
-  nohup python3 -m http.server $HTTP_SERVER_PORT > http-server.log &
+  nohup python3 -m http.server $FILE_SERVER_PORT > http-server.log &
   tail -f /dev/null
 fi
 

diff --git a/components/testing/tests/client_gateway/outbound_proxy_test.sh b/components/testing/tests/client_gateway/outbound_proxy_test.sh
@@ -13,7 +13,7 @@ reset_db
 create_rtpengine_entry "udp:media_proxy:2223"
 reload_opensips_tables
 
-uas="$(dig +short testing)"
+uas="$(hostname -i)"
 client_gateway="$(dig +short client_gateway)"
 media_proxy="$(dig +short media_proxy)"
 

diff --git a/components/testing/tests/public_gateway/alternative_outbound_test.sh b/components/testing/tests/public_gateway/alternative_outbound_test.sh
@@ -9,6 +9,8 @@ source $current_dir/../support/test_helpers.sh
 log_file=$(find . -type f -iname "uas_*_messages.log")
 cat /dev/null > $log_file
 
+uas="$(hostname -i)"
+
 curl -s -o /dev/null -XPOST -u "adhearsion:password" http://switch-app:8080/calls \
 -H 'Content-Type: application/json; charset=utf-8' \
 --data-binary @- << EOF
@@ -28,7 +30,7 @@ curl -s -o /dev/null -XPOST -u "adhearsion:password" http://switch-app:8080/call
     "dial_string_prefix": null,
     "plus_prefix": false,
     "national_dialing": false,
-    "host": "testing",
+    "host": "$uas",
     "username": null,
     "symmetric_latching": false
   }

diff --git a/components/testing/tests/public_gateway/outbound_test.sh b/components/testing/tests/public_gateway/outbound_test.sh
@@ -9,7 +9,7 @@ source $current_dir/../support/test_helpers.sh
 log_file=$(find . -type f -iname "uas_*_messages.log")
 cat /dev/null > $log_file
 
-uas="$(dig +short testing)"
+uas="$(hostname -i)"
 media_server="$(dig +short freeswitch)"
 
 curl -s -o /dev/null -XPOST -u "adhearsion:password" http://switch-app:8080/calls \
@@ -31,7 +31,7 @@ curl -s -o /dev/null -XPOST -u "adhearsion:password" http://switch-app:8080/call
     "dial_string_prefix": null,
     "plus_prefix": false,
     "national_dialing": false,
-    "host": "testing",
+    "host": "$uas",
     "username": null,
     "symmetric_latching": true
   },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -163,7 +163,7 @@ services:
       DATABASE_USERNAME: postgres
       FIFO_DIR: /opensips/fifo
       WS_SERVER_PORT: 3001
-      HTTP_SERVER_PORT: 8000
+      FILE_SERVER_PORT: 8000
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes: