Skip to content

Commit e26dffc

Browse files
authored
[chore] Address GitHub's brownout of windows-2019 runners (#6285)
1 parent d99d856 commit e26dffc

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/otelcol-fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
needs: [ otelcol-fips ]
135135
strategy:
136136
matrix:
137-
WIN_VERSION: [ 2019, 2022 ]
137+
WIN_VERSION: [ 2022, 2025 ]
138138
fail-fast: false
139139
steps:
140140
- uses: actions/checkout@v4

.github/workflows/vuln-scans.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
needs: [ "binaries-windows_amd64" ]
160160
strategy:
161161
matrix:
162-
OS: [ windows-2019, windows-2022 ]
162+
OS: [ windows-2022, windows-2025 ]
163163
fail-fast: false
164164
env:
165165
PIP_CACHE_DIR: ${{ github.workspace }}/.cache/pip
@@ -181,8 +181,8 @@ jobs:
181181
$ErrorActionPreference = 'Stop'
182182
Copy-Item .\bin\otelcol_windows_amd64.exe .\cmd\otelcol\otelcol.exe
183183
Copy-Item .\dist\agent-bundle_windows_amd64.zip .\cmd\otelcol\agent-bundle_windows_amd64.zip
184-
if ("${{ matrix.OS }}" -eq "windows-2019") {
185-
$base_image = "mcr.microsoft.com/windows/servercore:ltsc2019"
184+
if ("${{ matrix.OS }}" -eq "windows-2025") {
185+
$base_image = "mcr.microsoft.com/windows/servercore:ltsc2025"
186186
} else {
187187
$base_image = "mcr.microsoft.com/windows/servercore:ltsc2022"
188188
}

deployments/chef/kitchen.windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ verifier:
1919
name: inspec
2020

2121
platforms:
22-
- name: windows-2019
22+
- name: windows-2022
2323
driver:
24-
dockerfile: test/windows/Dockerfile.windows-2019
24+
dockerfile: test/windows/Dockerfile.windows-2022
2525
build_context: true
2626
platform: windows
27-
- name: windows-2022
27+
- name: windows-2025
2828
driver:
29-
dockerfile: test/windows/Dockerfile.windows-2022
29+
dockerfile: test/windows/Dockerfile.windows-2025
3030
build_context: true
3131
platform: windows
3232

deployments/chef/test/windows/Dockerfile.windows-2019 renamed to deployments/chef/test/windows/Dockerfile.windows-2025

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/windows/servercore:ltsc2019
1+
FROM mcr.microsoft.com/windows/servercore:ltsc2025
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

0 commit comments

Comments
 (0)