Skip to content

Commit 8d00900

Browse files
omajidclaude
andcommitted
Don't fail when rpm is not installed
In environments where rpm is not available, the TestRunner.LogEnvironment method throws an exception: Unhandled exception: System.ComponentModel.Win32Exception (2): An error occurred trying to start process 'rpm' with working directory 'Samples'. No such file or directory The code tries to handle these environments (like alpine), but doesn't catch the actual Win32Exception thrown when the rpm command is not found. It only catches InvalidOperationException (which happens when rpm command exits with an error). Also update CI to catch issues like this by adding an alpine leg. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 6ce0abf commit 8d00900

2 files changed

Lines changed: 46 additions & 24 deletions

File tree

.github/workflows/ci.yml

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
container_image:
17+
- docker.io/library/alpine:latest
1718
- quay.io/centos/centos:stream9
1819
- quay.io/centos/centos:stream10
19-
- registry.fedoraproject.org/fedora:42
2020
- registry.fedoraproject.org/fedora:43
21+
- registry.fedoraproject.org/fedora:44
2122
- registry.fedoraproject.org/fedora:rawhide
2223
- registry.access.redhat.com/ubi8
2324
- registry.access.redhat.com/ubi9
@@ -36,13 +37,17 @@ jobs:
3637
timeout-minutes: 5
3738
run: |
3839
set -euo pipefail
39-
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
40-
dnf install -y \
41-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
42-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
43-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
44-
if [[ ${{ matrix.dotnet_version }} != 8.* ]]; then
45-
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
40+
if grep fedora /etc/os-release; then
41+
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
42+
dnf install -y \
43+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
44+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
45+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
46+
if [[ ${{ matrix.dotnet_version }} != 8.* ]]; then
47+
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
48+
fi
49+
elif grep alpine /etc/os-release; then
50+
apk add --no-cache bash dotnet-sdk-${{ matrix.dotnet_version }} git make
4651
fi
4752
4853
- uses: actions/checkout@v2
@@ -78,6 +83,7 @@ jobs:
7883
fail-fast: false
7984
matrix:
8085
container_image:
86+
- docker.io/library/alpine:latest
8187
- quay.io/centos/centos:stream9
8288
- quay.io/centos/centos:stream10
8389
- registry.fedoraproject.org/fedora:42
@@ -100,13 +106,17 @@ jobs:
100106
timeout-minutes: 5
101107
run: |
102108
set -euo pipefail
103-
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
104-
dnf install -y \
105-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
106-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
107-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
108-
if [[ ${{ matrix.dotnet_version }} != 8.* ]]; then
109-
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
109+
if grep fedora /etc/os-release; then
110+
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
111+
dnf install -y \
112+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
113+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
114+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
115+
if [[ ${{ matrix.dotnet_version }} != 8.* ]]; then
116+
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
117+
fi
118+
elif grep alpine /etc/os-release; then
119+
apk add --no-cache bash dotnet-sdk-${{ matrix.dotnet_version }} git make
110120
fi
111121
112122
# We need to fetch the tags, so 'git tag' in 'make publish' below works
@@ -129,22 +139,33 @@ jobs:
129139
- name: Install Test dependencies
130140
timeout-minutes: 2
131141
run: |
132-
dnf install -y python3 wget $(grep '^Dependencies(dnf): ' dotnet-regular-tests/README.md | cut -d: -f2-) --skip-broken
142+
if grep fedora /etc/os-release; then
143+
dnf install -y python3 wget $(grep '^Dependencies(dnf): ' dotnet-regular-tests/README.md | cut -d: -f2-) --skip-broken
144+
elif grep alpine /etc/os-release; then
145+
apk add python3 wget curl $(grep '^Dependencies(apk): ' dotnet-regular-tests/README.md | cut -d: -f2-)
146+
echo -e '[PostgreSQL]\nDescription=PostgreSQL Unicode\nDriver=/usr/lib/psqlodbcw.so\nUsageCount=1' > /etc/odbcinst.ini
147+
fi
133148
134149
- name: Run reproducers
150+
shell: bash
135151
run: |
136152
set -euo pipefail
137-
### HACK: Filter tests that can't pass in Containers
138-
rm -r dotnet-regular-tests/debugging-sos-lldb* dotnet-regular-tests/createdump-aspnet dotnet-regular-tests/cgroup-limit
139153
140-
### HACK: UBI 8 is missing strace and bash-completion packages for these tests
141-
if [[ ${{ matrix.container_image }} == *ubi* ]] ; then
142-
rm -r dotnet-regular-tests/telemetry-is-off-by-default dotnet-regular-tests/bash-completion dotnet-regular-tests/system-data-odbc
154+
trait_flags=()
155+
156+
if [[ ${{ matrix.container_image }} == *ubi8 ]] ; then
157+
trait_flags+=( --trait ubi8-repos )
158+
fi
159+
if [[ ${{ matrix.container_image }} == *ubi9 ]] ; then
160+
trait_flags+=( --trait ubi9-repos )
161+
fi
162+
if [[ ${{ matrix.container_image }} == *ubi10 ]] ; then
163+
trait_flags+=( --trait ubi10-repos )
143164
fi
144165
145166
dotnet --info
167+
dotnet turkey/Turkey.dll dotnet-regular-tests -v --timeout 600 --trait github-ci "${trait_flags[@]}"
146168
147-
dotnet turkey/Turkey.dll dotnet-regular-tests -v --timeout 600
148169
149170
- name: Show Logs
150171
if: ${{ always() }}

Turkey/TestRunner.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.ComponentModel;
34
using System.Diagnostics;
45
using System.IO;
56
using System.Linq;
@@ -184,15 +185,15 @@ private static void LogEnvironment(string logDir)
184185
string installedPackages = ProcessRunner.Run("rpm", "--query", "--all");
185186
File.WriteAllText(Path.Combine(logDir, "packages"), installedPackages);
186187
}
187-
catch (InvalidOperationException e)
188+
catch (Exception e) when (e is InvalidOperationException or Win32Exception)
188189
{
189190
string error = e.Message;
190191
try
191192
{
192193
string installedPackages = ProcessRunner.Run("apk", "list", "--installed");
193194
File.WriteAllText(Path.Combine(logDir, "packages"), installedPackages);
194195
}
195-
catch (InvalidOperationException e2)
196+
catch (Exception e2) when (e2 is InvalidOperationException or Win32Exception)
196197
{
197198
error = error + Environment.NewLine + e2.Message;
198199
string installedPackages = "could not find installed packages" + Environment.NewLine + error;

0 commit comments

Comments
 (0)