Update test run script

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.400",
+    "version": "6.0.110",
     "rollForward": "latestFeature"
   }
-}
+}

src/InformaticsGateway/Logging/Log.100.200.ScpService.cs

@@ -59,8 +59,8 @@ public static partial class Log
         public static partial void NotifyAeChanged(this ILogger logger, int count, ChangedEventType eventType);
 
         // SCP Service
-        [LoggerMessage(EventId = 200, Level = LogLevel.Information, Message = "MONAI Deploy Informatics Gateway (SCP Service) {version} loading...")]
-        public static partial void ScpServiceLoading(this ILogger logger, string version);
+        [LoggerMessage(EventId = 200, Level = LogLevel.Information, Message = "Initializing SCP Service at port {port}...")]
+        public static partial void ScpServiceLoading(this ILogger logger, int port);
 
         [LoggerMessage(EventId = 201, Level = LogLevel.Critical, Message = "Failed to initialize SCP listener.")]
         public static partial void ScpListenerInitializationFailure(this ILogger logger);

src/InformaticsGateway/Services/Scp/ScpService.cs

@@ -78,7 +78,7 @@ public void Dispose()
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            _logger.ScpServiceLoading(Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>().Version);
+            _logger.ScpServiceLoading(_configuration.Value.Dicom.Scp.Port);
 
             try
             {

tests/Integration.Test/.env.dev

@@ -18,14 +18,14 @@
 export VSTEST_HOST_DEBUG=0
 
 export SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+DOCKER_COMPOSE_DIR="$SCRIPT_DIR/../../docker-compose"
+RUN_DIR="$DOCKER_COMPOSE_DIR/.run"
 TEST_DIR="$SCRIPT_DIR/"
 LOG_DIR="${GITHUB_WORKSPACE:-$SCRIPT_DIR}"
-RUN_DIR="$SCRIPT_DIR/.run"
 BIN_DIR="$TEST_DIR/bin/Release/net6.0"
 CONFIG_DIR="$SCRIPT_DIR/configs"
 EXIT=false
 METRICSFILE="$LOG_DIR/metrics.log"
-LOADDEV=
 FEATURE=
 STREAMID=
 export STUDYJSON="study.json"
@@ -51,6 +51,7 @@ function check_status_code() {
 }
 
 function env_setup() {
+    [ -f $LOG_DIR/run.log ] && info "Deletig existing $LOG_DIR/run.log" && sudo rm $LOG_DIR/run.log
     [ -d $RUN_DIR ] && info "Removing $RUN_DIR..." && sudo rm -r $RUN_DIR
     mkdir -p $RUN_DIR
 
@@ -70,13 +71,6 @@ function env_setup() {
             info "Filtering by feature=$FEATURE"
             shift 2
             ;;
-        -d | --dev )
-            info "Using .env.dev..."
-            LOADDEV="--env-file .env.dev"
-            info "Using study.json.dev..."
-            STUDYJSON="study.json.dev"
-            shift;
-            ;;
         --)
             shift;
             break
@@ -87,10 +81,12 @@ function env_setup() {
     esac
     done
 
+    pushd $DOCKER_COMPOSE_DIR
     if [[ $(docker compose ps -q | wc -l) -ne 0 ]]; then
         info "Stopping existing services..."
-        docker compose $LOADDEV down
+        docker compose down
     fi
+    popd
 
     if (dotnet tool list --global | grep livingdoc &>/dev/null); then
         info "Upgrading SpecFlow.Plus.LivingDoc.CLI..."
@@ -110,63 +106,26 @@ function build() {
 }
 
 function start_services() {
-    info "Starting dependencies docker compose $LOADDEV up -d --force-recreate..."
-    docker compose $LOADDEV up -d --force-recreate
-
-    HOST_IP=$(docker network inspect testrunner | jq -r .[0].IPAM.Config[0].Gateway)
-    info "Host IP = $HOST_IP"
-    export HOST_IP
+    info "Starting dependencies docker compose up -d --force-recreate..."
+    pushd $DOCKER_COMPOSE_DIR
+    ./init.sh
+    docker compose -p igtest up -d --force-recreate
+    popd
 
     info "============================================="
-    docker container ls --format 'table {{.Names}}\t{{.ID}}' | grep integrationtest
+    docker container ls --format 'table {{.Names}}\t{{.ID}}' | grep igtest-
     info "============================================="
 
-    set +e
-    COUNTER=0
-    EXPECTEDSERVICE=8
-    while true; do
-        info "Waiting for Informatics Gateway ($COUNTER)..."
-        count=$(curl -s http://$HOST_IP:5000/health/status | jq | grep "running" | wc -l)
-        info "$count services running..."
-        if [ $count -eq $EXPECTEDSERVICE ]; then
-            break
-        fi
-        if [ $COUNTER -gt 100 ]; then
-            fatal "Timeout waiting for Informatics Gateway services to be ready ($COUNTER/$EXPECTEDSERVICE)."
-        fi
-        let COUNTER=COUNTER+1
-        sleep 1s
-    done
-    set -e
-
     sleep 1
     sudo chown -R $USER:$USER $RUN_DIR
 }
 
-function write_da_metrics() {
-    docker container list
-    CID="$(docker container list | grep informatics-gateway | awk '{{print $1}}')"
-    info "Streaming Informatics Gateway perf logs from container $CID to $METRICSFILE"
-
-    until $EXIT; do
-        DATA=$(docker stats $CID --no-stream --format "$(date +%s),{{.CPUPerc}},{{.MemUsage}},{{.NetIO}},{{.BlockIO}}")
-        echo $DATA >>$METRICSFILE
-        sleep 1
-    done
-}
-
-function stream_da_metrics() {
-    [ -f $METRICSFILE ] && sudo rm $METRICSFILE
-    write_da_metrics &
-    STREAMID=$!
-}
-
 function run_test() {
     pushd $TEST_DIR
     set +e
     info "Starting test runner..."
 
-    if [[ "$VSTEST_HOST_DEBUG" == 0 ]]; then 
+    if [[ "$VSTEST_HOST_DEBUG" == 0 ]]; then
         dotnet test -c Release $FEATURE 2>&1 | tee $LOG_DIR/run.log
     else
         dotnet test -c Debug $FEATURE 2>&1 | tee $LOG_DIR/run.log
@@ -189,31 +148,29 @@ function generate_reports() {
 
 function save_logs() {
     [ -d $RUN_DIR ] && info "Clearning $RUN_DIR..." && sudo rm -r $RUN_DIR
+    pushd $DOCKER_COMPOSE_DIR
     info "Saving service log..."
-    docker compose $LOADDEV logs --no-color -t > "$LOG_DIR/services.log"
+    docker compose logs --no-color -t > "$LOG_DIR/services.log"
+    popd
 }
 
 function tear_down() {
-    set +e
-    info "Stop streaming metrics log..."
-    kill $STREAMID >/dev/null 2>&1
-    set -e
-
+    pushd $DOCKER_COMPOSE_DIR
     info "Stopping services..."
-    docker compose $LOADDEV down --remove-orphans
+    docker compose down --remove-orphans
+    popd
 }
 
 function main() {
     df -h
     env_setup "$@"
     build
     start_services
-    stream_da_metrics
     run_test
     generate_reports
     df -h
-    save_logs
-    tear_down
+    # save_logs
+    # tear_down
     exit $EXITCODE
 }