From d7ee355c85cbe6f2dc0c18dac52084f449a95459 Mon Sep 17 00:00:00 2001 From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:34:05 -0500 Subject: [PATCH] test: Remove CentOS from Linux smoke tests --- .../SmokeTestApp/Dockerfile.centos | 43 ------------------- .../Fixtures/ContainerTestFixtures.cs | 17 -------- .../Tests/InfiniteTracingContainerTests.cs | 6 --- .../Tests/LinuxContainerTests.cs | 14 ------ 4 files changed, 80 deletions(-) delete mode 100644 tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.centos diff --git a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.centos b/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.centos deleted file mode 100644 index b334c86bad..0000000000 --- a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.centos +++ /dev/null @@ -1,43 +0,0 @@ -ARG DOTNET_VERSION -ARG TARGET_ARCH -FROM --platform=${TARGET_ARCH} quay.io/centos/centos:stream9 AS base -WORKDIR /app -EXPOSE 80 - -# build image is always amd64 (to match the runner architecture), even though the target architecture may be arm64 -FROM --platform=amd64 mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS build -ARG TARGET_ARCH -WORKDIR /src -COPY ["SmokeTestApp/SmokeTestApp.csproj", "SmokeTestApp/"] -RUN dotnet restore "SmokeTestApp/SmokeTestApp.csproj" -a ${TARGET_ARCH} - -COPY . . -WORKDIR "/src/SmokeTestApp" -RUN dotnet build "SmokeTestApp.csproj" -c Release -o /app/build --os linux -a ${TARGET_ARCH} - -FROM build AS publish -RUN dotnet publish "SmokeTestApp.csproj" -c Release -o /app/publish /p:UseAppHost=false --os linux -a ${TARGET_ARCH} - -FROM base AS final -ARG DOTNET_VERSION -# install asp.netcore -RUN dnf install aspnetcore-runtime-${DOTNET_VERSION} -y - -# Enable the agent -ARG NEW_RELIC_HOST -ARG NEW_RELIC_LICENSE_KEY -ARG NEW_RELIC_APP_NAME - -ENV CORECLR_ENABLE_PROFILING=1 \ -CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \ -CORECLR_NEWRELIC_HOME=/usr/local/newrelic-dotnet-agent \ -CORECLR_PROFILER_PATH=/usr/local/newrelic-dotnet-agent/libNewRelicProfiler.so \ -NEW_RELIC_HOST=${NEW_RELIC_HOST} \ -NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY} \ -NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME} \ -NEWRELIC_LOG_DIRECTORY=/app/logs - -WORKDIR /app -COPY --from=publish /app/publish . - -ENTRYPOINT ["dotnet", "SmokeTestApp.dll"] \ No newline at end of file diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Fixtures/ContainerTestFixtures.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Fixtures/ContainerTestFixtures.cs index 63e005aa49..b0a757d604 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Fixtures/ContainerTestFixtures.cs +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Fixtures/ContainerTestFixtures.cs @@ -75,23 +75,6 @@ public class UbuntuArm64ContainerTestFixture : ContainerTestFixtureBase public UbuntuArm64ContainerTestFixture() : base(DistroTag, Architecture, Dockerfile) { } } -public class CentosX64ContainerTestFixture : ContainerTestFixtureBase -{ - private const string Dockerfile = "SmokeTestApp/Dockerfile.centos"; - private const ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64; - private const string DistroTag = "centos"; - - public CentosX64ContainerTestFixture() : base(DistroTag, Architecture, Dockerfile) { } -} -public class CentosArm64ContainerTestFixture : ContainerTestFixtureBase -{ - private const string Dockerfile = "SmokeTestApp/Dockerfile.centos"; - private const ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.Arm64; - private const string DistroTag = "centos"; - - public CentosArm64ContainerTestFixture() : base(DistroTag, Architecture, Dockerfile) { } -} - public class AmazonX64ContainerTestFixture : ContainerTestFixtureBase { private const string Dockerfile = "SmokeTestApp/Dockerfile.amazon"; diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs index 007ee9573d..8169046864 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs @@ -93,12 +93,6 @@ public class DebianArm64InfiniteTracingContainerTest(DebianArm64ContainerTestFix //public class UbuntuArm64InfiniteTracingContainerTest(UbuntuArm64ContainerTestFixture fixture, ITestOutputHelper output) // : InfiniteTracingContainerTest(fixture, output); -//public class CentosX64InfiniteTracingContainerTest(CentosX64ContainerTestFixture fixture, ITestOutputHelper output) -// : InfiniteTracingContainerTest(fixture, output); - -//public class CentosArm64InfiniteTracingContainerTest(CentosArm64ContainerTestFixture fixture, ITestOutputHelper output) -// : InfiniteTracingContainerTest(fixture, output); - public class AmazonX64InfiniteTracingContainerTest(AmazonX64ContainerTestFixture fixture, ITestOutputHelper output) : InfiniteTracingContainerTest(fixture, output); diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs index 300968361a..4130e9c40c 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs @@ -82,20 +82,6 @@ public UbuntuArm64ContainerTest(UbuntuArm64ContainerTestFixture fixture, ITestOu } } -public class CentosX64ContainerTest : LinuxContainerTest -{ - public CentosX64ContainerTest(CentosX64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) - { - } -} - -public class CentosArm64ContainerTest : LinuxContainerTest -{ - public CentosArm64ContainerTest(CentosArm64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) - { - } -} - public class AmazonX64ContainerTest : LinuxContainerTest { public AmazonX64ContainerTest(AmazonX64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output)