diff --git a/Framework/Core/Http.cs b/Framework/Core/Http.cs index 968bdb7..192152f 100644 --- a/Framework/Core/Http.cs +++ b/Framework/Core/Http.cs @@ -93,7 +93,7 @@ namespace Core { var response = PostJsonString(route, body); if (response == null) throw new Exception("Received no response."); - var result = JsonConvert.DeserializeObject(response); + var result = Deserialize(response); if (result == null) throw new Exception("Failed to deserialize response"); return result; }, $"HTTO-POST-JSON: {route}"); diff --git a/Tests/CodexContinuousTests/deploy-and-run.sh b/Tests/CodexContinuousTests/deploy-and-run.sh index fdd620c..5dd7a5e 100644 --- a/Tests/CodexContinuousTests/deploy-and-run.sh +++ b/Tests/CodexContinuousTests/deploy-and-run.sh @@ -1,8 +1,9 @@ set -e -replication=5 -name=testnamehere -filter=TwoClient +replication=$DNR_REP +name=$DNR_NAME +filter=$DNR_FILTER +duration=$DNR_DURATION echo "Deploying..." cd ../../Tools/CodexNetDeployer @@ -45,7 +46,7 @@ do --filter=$filter \ --cleanup=1 \ --full-container-logs=1 \ - --target-duration=172800 # 48 hours + --target-duration=$duration sleep 30 done diff --git a/docker/deployandrun.Dockerfile b/docker/deployandrun.Dockerfile new file mode 100644 index 0000000..869f017 --- /dev/null +++ b/docker/deployandrun.Dockerfile @@ -0,0 +1,12 @@ +FROM mcr.microsoft.com/dotnet/sdk:7.0 + +RUN apt-get update && apt-get install -y screen +WORKDIR /app +COPY --chmod=0755 docker/docker-dnr-entrypoint.sh / +COPY ./Tools ./Tools +COPY ./Tests ./Tests +COPY ./Framework ./Framework +COPY ./ProjectPlugins ./ProjectPlugins + +ENTRYPOINT ["/docker-dnr-entrypoint.sh"] +CMD ["/bin/bash", "deploy-and-run.sh"] diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 98af246..510f654 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -9,3 +9,12 @@ services: - KUBECONFIG=/opt/kubeconfig - LOGPATH=/opt/logs - RUNNERLOCATION=ExternalToCluster + + continuous-test-run: + image: thatbenbierens/dist-tests-deployandrun:initial + environment: + # - CODEXDOCKERIMAGE=imageoverride + - DNR_REP=3 + - DNR_NAME=Tryout + - DNR_FILTER=PeernBeer + - DNR_DURATION=172800 diff --git a/docker/docker-dnr-entrypoint.sh b/docker/docker-dnr-entrypoint.sh new file mode 100644 index 0000000..5475acb --- /dev/null +++ b/docker/docker-dnr-entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/bash +echo "Running continuous tests..." +cd /app/Tests/CodexContinuousTests +exec "$@" +