diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml index cda85710..dbc56381 100644 --- a/.github/workflows/CodeQuality.yml +++ b/.github/workflows/CodeQuality.yml @@ -127,7 +127,19 @@ jobs: run: dotnet restore integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln - name: Run Integration Tests - run: dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln --logger "trx;LogFileName=test_results.trx" --verbosity detailed + run: | + set +e + dotnet test integration-tests/IntegrationTestSuite/MessagePackIntegrationTests/MessagePackIntegrationTests.csproj \ + --settings integration-tests/IntegrationTestSuite/.runsettings \ + --logger "trx;LogFileName=msgpack_results.trx" --verbosity detailed + MESSAGEPACK_EXIT=$? + dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests/WebservicesIntegrationTests.csproj \ + --settings integration-tests/IntegrationTestSuite/.runsettings \ + --logger "trx;LogFileName=test_results.trx" --verbosity detailed + WEBSERVICES_EXIT=$? + echo "MessagePackIntegrationTests exit code: $MESSAGEPACK_EXIT" + echo "WebservicesIntegrationTests exit code: $WEBSERVICES_EXIT" + [ $MESSAGEPACK_EXIT -eq 0 ] && [ $WEBSERVICES_EXIT -eq 0 ] - name: Shutdown Integration Test session run: dotnet-coverage shutdown integrationtestsession diff --git a/CometServer/CometServer.csproj b/CometServer/CometServer.csproj index b194c000..0aa5b299 100644 --- a/CometServer/CometServer.csproj +++ b/CometServer/CometServer.csproj @@ -18,7 +18,7 @@ - + @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/CometServer/appsettings.Production.json b/CometServer/appsettings.Production.json index 638b7668..0c5cb8b7 100644 --- a/CometServer/appsettings.Production.json +++ b/CometServer/appsettings.Production.json @@ -90,19 +90,7 @@ }, "WriteTo": [ { - "Name": "GrafanaLoki", - "Args": { - "uri": "http://localhost:3100", - "labels": [ - { - "key": "app", - "value": "CDP4-COMET WebServices-01" - } - ], - "propertiesAsLabels": [ - "app" - ] - } + "Name": "Console" } ], "WriteTo:Async": {