From 34387399017ec2cba99b1ea9512ecb51f6a80c44 Mon Sep 17 00:00:00 2001 From: Alan West <3676547+alanwest@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:52:55 -0700 Subject: [PATCH] Rename directory to IntegrationTest --- .github/workflows/integration.yml | 2 +- .../{integration-test => IntegrationTest}/.gitignore | 0 .../{integration-test => IntegrationTest}/Dockerfile | 2 +- .../IntegrationTests.cs | 0 .../create-cert.sh | 0 .../docker-compose.yml | 10 +++++----- .../otel-collector-config.yaml | 0 .../{integration-test => IntegrationTest}/run-test.sh | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/.gitignore (100%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/Dockerfile (95%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/IntegrationTests.cs (100%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/create-cert.sh (100%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/docker-compose.yml (81%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/otel-collector-config.yaml (100%) rename test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/{integration-test => IntegrationTest}/run-test.sh (100%) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c5bc7d14e91..c13a6eee1bc 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -33,4 +33,4 @@ jobs: - uses: actions/checkout@v3 - name: Run OTLP Exporter docker-compose.integration - run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build + run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/.gitignore b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/.gitignore similarity index 100% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/.gitignore rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/.gitignore diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile similarity index 95% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile index 6b2543a4a03..9b7b8214184 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile @@ -1,6 +1,6 @@ # Create a container for running the OpenTelemetry Collector integration tests. # This should be run from the root of the repo: -# docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile +# docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile ARG BUILD_SDK_VERSION=7.0 ARG TEST_SDK_VERSION=7.0 diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/IntegrationTests.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/IntegrationTests.cs similarity index 100% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/IntegrationTests.cs rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/IntegrationTests.cs diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/create-cert.sh b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/create-cert.sh similarity index 100% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/create-cert.sh rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/create-cert.sh diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml similarity index 81% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml index e0350b27cf0..cad1ff0695d 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml @@ -1,6 +1,6 @@ # Starts an OpenTelemetry Collector and then runs the OTLP exporter integration tests. # This should be run from the root of the repo: -# docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml --project-directory=. up --exit-code-from=tests --build +# docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --project-directory=. up --exit-code-from=tests --build version: '3.7' @@ -8,13 +8,13 @@ services: create-cert: image: mcr.microsoft.com/dotnet/sdk:7.0 volumes: - - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg + - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest:/cfg command: /cfg/create-cert.sh otel-collector: image: otel/opentelemetry-collector volumes: - - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg + - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest:/cfg command: --config=/cfg/otel-collector-config.yaml depends_on: - create-cert @@ -22,9 +22,9 @@ services: tests: build: context: . - dockerfile: ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile + dockerfile: ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile volumes: - - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg + - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest:/cfg command: /cfg/run-test.sh environment: - OTEL_COLLECTOR_HOSTNAME=otel-collector diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/otel-collector-config.yaml b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/otel-collector-config.yaml similarity index 100% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/otel-collector-config.yaml rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/otel-collector-config.yaml diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/run-test.sh b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/run-test.sh similarity index 100% rename from test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/run-test.sh rename to test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/run-test.sh