Skip to content

Commit cf6faae

Browse files
authored
Remove the test rpm step as it's blocking builds and disabled in all other branches (#45752)
2 parents 4fca7aa + 1613483 commit cf6faae

File tree

1 file changed

+3
-60
lines changed

1 file changed

+3
-60
lines changed

src/Installer/redist-installer/targets/GenerateRPMs.targets

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
DependsOnTargets="GetCurrentRuntimeInformation;
1212
GenerateRpmsInner" />
1313

14+
<!-- Removed TestSdkRpm. SDK RPMS should be tested in a separate container to avoid polluting or relying on the
15+
build environment. https://github.com/dotnet/sdk/issues/41910 -->
1416
<Target Name="GenerateRpmsInner"
15-
DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm"
17+
DependsOnTargets="TestFPMTool;BuildRpms"
1618
Condition=" '$(IsRPMBasedDistro)' == 'True' "
1719
Outputs="@(GeneratedInstallers)" />
1820

@@ -150,16 +152,6 @@
150152
</SDKTokenValue>
151153
</ItemGroup>
152154

153-
<ItemGroup>
154-
<TestSdkRpmTaskEnvironmentVariables Include="PATH=$(RpmInstalledDirectory)$(PathListSeparator)$(PATH)" />
155-
<TestSdkRpmTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
156-
<TestSdkRpmTaskEnvironmentVariables Include="TEST_PACKAGES=$(TestPackagesDir)" />
157-
<TestSdkRpmTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" />
158-
159-
<!-- Consumed By Publish -->
160-
<!--<GeneratedInstallers Include="$(SdkRPMInstallerFile)" />-->
161-
</ItemGroup>
162-
163155
<ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
164156
DestinationFiles="$(AfterInstallHostScriptDestinationFile)"
165157
ReplacementItems="@(AfterInstallHostTokenValue)" />
@@ -310,53 +302,4 @@
310302
Importance="High" />
311303
</Target>
312304

313-
<Target Name="TestSdkRpm"
314-
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
315-
Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
316-
$(DownloadedNetStandardTargetingPackInstallerFile);
317-
$(DownloadedNetCoreAppHostPackInstallerFile);
318-
$(DownloadedAspNetTargetingPackInstallerFile);
319-
$(DownloadedRuntimeDepsInstallerFile);
320-
$(DownloadedSharedHostInstallerFile);
321-
$(DownloadedHostFxrInstallerFile);
322-
$(DownloadedSharedFrameworkInstallerFile);
323-
$(DownloadedAspNetCoreSharedFxInstallerFile);
324-
$(SdkRPMInstallerFile);
325-
$(RpmTestResultsXmlFile);"
326-
Outputs="$(RpmTestResultsXmlFile)">
327-
328-
<!-- Install Dependencies and SDK Packages -->
329-
<Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
330-
<Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" />
331-
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" />
332-
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
333-
<Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" />
334-
<Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" />
335-
<Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" />
336-
<Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" />
337-
<Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" />
338-
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
339-
<Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
340-
<Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" />
341-
342-
<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
343-
<DotNetRestore ProjectPath="$(EndToEndTestProject)"
344-
ToolPath="$(RpmInstalledDirectory)" />
345-
<DotNetTest ProjectPath="$(EndToEndTestProject)"
346-
EnvironmentVariables="@(TestSdkRpmTaskEnvironmentVariables)"
347-
ToolPath="$(RpmInstalledDirectory)" />-->
348-
349-
<!-- Clean up Packages -->
350-
<Exec Command="sudo rpm -ev --nodeps $(SdkRpmPackageName)" />
351-
<Exec Command="sudo rpm -ev --nodeps $(AspNetCoreSharedFxRpmPackageName)" />
352-
<Exec Command="sudo rpm -ev --nodeps $(SharedFxRpmPackageName)" />
353-
<Exec Command="sudo rpm -ev --nodeps $(HostFxrRpmPackageName)" />
354-
<Exec Command="sudo rpm -ev --nodeps $(SharedHostRpmPackageName)" />
355-
<Exec Command="sudo rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" />
356-
<Exec Command="sudo rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" />
357-
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" />
358-
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" />
359-
<Exec Command="sudo rpm -ev --nodeps $(RuntimeDepsPackageName)" />
360-
</Target>
361-
362305
</Project>

0 commit comments

Comments
 (0)