Skip to content

Commit 42b642b

Browse files
authored
Remove the TestSdkRpm (#48400)
2 parents fe6d1ce + 1cc00f1 commit 42b642b

File tree

1 file changed

+2
-59
lines changed

1 file changed

+2
-59
lines changed

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

+2-59
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
GenerateRpmsInner" />
1313

1414
<Target Name="GenerateRpmsInner"
15-
DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm"
15+
DependsOnTargets="TestFPMTool;BuildRpms"
1616
Condition=" '$(IsRPMBasedDistro)' == 'True' "
1717
Outputs="@(GeneratedInstallers)" />
1818

@@ -150,16 +150,6 @@
150150
</SDKTokenValue>
151151
</ItemGroup>
152152

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-
163153
<ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
164154
DestinationFiles="$(AfterInstallHostScriptDestinationFile)"
165155
ReplacementItems="@(AfterInstallHostTokenValue)" />
@@ -310,53 +300,6 @@
310300
Importance="High" />
311301
</Target>
312302

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>
303+
<!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package -->
361304

362305
</Project>

0 commit comments

Comments
 (0)