Test on Windows 2025 (signalfx#5761)

asreehari-splunk · Jan 8, 2025 · 88a8c31 · 88a8c31
1 parent 85d45c7
commit 88a8c31
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/win-installer-script-test.yml b/.github/workflows/win-installer-script-test.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.OS }}
     strategy:
       matrix:
-        OS: [ "windows-2022" ]
+        OS: [ "windows-2022", "windows-2025" ]
         MODE: [ "agent", "gateway" ]
         WITH_FLUENTD: [ "true", "false" ]
       fail-fast: false

diff --git a/.github/workflows/win-package-test.yml b/.github/workflows/win-package-test.yml
@@ -68,7 +68,10 @@ jobs:
             ./bin/*
 
   agent-bundle-windows:
-    runs-on: windows-2022
+    runs-on: ${{ matrix.OS }}
+    strategy:
+      matrix:
+        OS: [ "windows-2022", "windows-2025" ]
     env:
       PIP_CACHE_DIR: ${{ github.workspace }}/.cache/pip
     steps:
@@ -83,7 +86,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: agent-bundle-windows
+          name: agent-bundle-windows-${{ matrix.OS }}
           path: ./dist/agent-bundle_windows_amd64.zip
 
   msi-custom-actions:
@@ -124,6 +127,9 @@ jobs:
 
   msi-build:
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        OS: [ "windows-2022", "windows-2025" ]
     needs: [cross-compile, agent-bundle-windows, msi-custom-actions]
     steps:
       - name: Check out the codebase.
@@ -146,7 +152,7 @@ jobs:
       - name: Downloading agent-bundle-windows
         uses: actions/download-artifact@v4
         with:
-          name: agent-bundle-windows
+          name: agent-bundle-windows-${{ matrix.OS }}
           path: ./dist
 
       - name: Downloading msi-custom-actions
@@ -163,11 +169,14 @@ jobs:
       - name: Uploading msi build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: msi-build
+          name: msi-build-${{ matrix.OS }}
           path: ./dist/*.msi
 
   dotnet-zeroconfig-e2e-test:
-    runs-on: windows-2022
+    runs-on: ${{ matrix.OS }}
+    strategy:
+      matrix:
+        OS: [ "windows-2022", "windows-2025" ]
     needs: [msi-build]
     steps:
       - name: Check out the codebase.
@@ -187,7 +196,7 @@ jobs:
       - name: Download Splunk OTel Collector msi
         uses: actions/download-artifact@v4
         with:
-          name: msi-build
+          name: msi-build-${{ matrix.OS }}
           path: ./tests/zeroconfig/windows/testdata/docker-setup/
 
       - name: Run the test script
@@ -196,6 +205,9 @@ jobs:
           .\run-tests.ps1
 
   msi-test:
+    strategy:
+      matrix:
+        OS: [ "windows-2022" ]
     runs-on: otel-windows
     needs: [msi-build]
     timeout-minutes: 40
@@ -206,7 +218,7 @@ jobs:
       - name: Downloading msi build
         uses: actions/download-artifact@v4
         with:
-          name: msi-build
+          name: msi-build-${{ matrix.OS }}
           path: ./dist
 
       - name: Set the MSI_COLLECTOR_PATH environment variable
@@ -226,7 +238,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        OS: [ "windows-2022" ]
+        OS: [ "windows-2022", "windows-2025" ]
         MODE: [ "agent", "gateway" ]
         WITH_FLUENTD: [ "true", "false" ]
     steps:
@@ -236,7 +248,7 @@ jobs:
       - name: Downloading msi build
         uses: actions/download-artifact@v4
         with:
-          name: msi-build
+          name: msi-build-${{ matrix.OS }}
           path: ./dist
 
       - name: Ensure required ports in the dynamic range are available
@@ -275,7 +287,10 @@ jobs:
         run: Get-Content -Path "${env:SYSTEMDRIVE}\opt\td-agent\td-agent.log"
 
   choco-build:
-    runs-on: windows-2022
+    runs-on: ${{ matrix.OS }}
+    strategy:
+      matrix:
+        OS: [ "windows-2022", "windows-2025" ]
     needs: [msi-build]
     steps:
       - name: Check out the codebase.
@@ -284,7 +299,7 @@ jobs:
       - name: Downloading msi build
         uses: actions/download-artifact@v4
         with:
-          name: msi-build
+          name: msi-build-${{ matrix.OS }}
           path: ./dist
 
       - name: Build Chocolatey
@@ -315,7 +330,7 @@ jobs:
       - name: Uploading choco build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: choco-build
+          name: choco-build-${{ matrix.OS }}
           path: ./dist/*.nupkg
 
   choco-test:
@@ -324,7 +339,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        OS: [ "windows-2022" ]
+        OS: [ "windows-2022", "windows-2025" ]
         MODE: [ "agent", "gateway" ]
         WITH_FLUENTD: [ "true", "false" ]
         SCENARIO: [ "install", "upgrade" ]
@@ -336,7 +351,7 @@ jobs:
       - name: Downloading choco build
         uses: actions/download-artifact@v4
         with:
-          name: choco-build
+          name: choco-build-${{ matrix.OS }}
           path: ./dist
 
       - name: Ensure required ports in the dynamic range are available
@@ -417,7 +432,7 @@ jobs:
     needs: [cross-compile, agent-bundle-windows]
     strategy:
       matrix:
-        OS: [ "windows-2022" ]
+        OS: [ "windows-2022", "windows-2025" ]
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -430,7 +445,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: agent-bundle-windows
+          name: agent-bundle-windows-${{ matrix.OS }}
           path: ./dist
 
       - name: Build docker image

diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.OS }}
     strategy:
       matrix:
-        OS: [ "windows-2022" ]
+        OS: [ "windows-2022", "windows-2025" ]
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4

diff --git a/tests/zeroconfig/windows/windows_iis_test.go b/tests/zeroconfig/windows/windows_iis_test.go
@@ -133,6 +133,7 @@ func testExpectedTracesForHTTPGetRequest(t *testing.T, otlp *testutils.OTLPRecei
 				ptracetest.IgnoreResourceAttributeValue("telemetry.sdk.version"),
 				ptracetest.IgnoreResourceAttributeValue("splunk.distro.version"),
 				ptracetest.IgnoreResourceAttributeValue("telemetry.distro.version"),
+				ptracetest.IgnoreResourceAttributeValue("os.description"),
 				ptracetest.IgnoreScopeSpanInstrumentationScopeVersion(),
 				ptracetest.IgnoreStartTimestamp(),
 				ptracetest.IgnoreEndTimestamp(),