Skip to content

Commit 2521733

Browse files
authored
[release/5.0] Exclude locally-built packages from smoke-test-prereqs. (#2382)
* Exclude locally-built packages from smoke-test-prereqs. This makes two changes to prevent our locally-built packages from making it into the smoke-test-prereqs tarball: - Remove any packages cached in the system cache after we copy it to our local NuGet cache (so we get the credential plugin). - Don't copy packages to the prereqs directory after the local tests (which can restore locally-built packages). This accomplishes two things: - Smoke-testing will be more true to the partner and user experience (using the official packages that a developer would restore when actually using the product). - The official packages will include all TFMs and runtimes so the smoke-test-prereqs tarball will be universal across all of our builds. * Enable online tests for CI smoke-tests.
1 parent 66bcc8c commit 2521733

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
<Target Name="RunSmokeTest" DependsOnTargets="GetProdConBlobFeedUrl">
154154
<PropertyGroup>
155155
<SmokeTestCommand>./smoke-test.sh</SmokeTestCommand>
156-
<SmokeTestCommand>$(SmokeTestCommand) --minimal</SmokeTestCommand>
157156
<SmokeTestCommand>$(SmokeTestCommand) --projectOutput</SmokeTestCommand>
158157
<SmokeTestCommand>$(SmokeTestCommand) --configuration $(Configuration)</SmokeTestCommand>
159158
<SmokeTestCommand>$(SmokeTestCommand) --archiveRestoredPackages</SmokeTestCommand>

smoke-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,8 @@ function resetCaches() {
560560
# Copy NuGet plugins if running user has HOME and we have auth. In particular, the auth plugin.
561561
if [ "${internalPackageFeedPat:-}" ] && [ "${executingUserHome:-}" ]; then
562562
cp -r "$executingUserHome/.nuget/" "$HOME/.nuget/" || :
563+
# remove cached packages if there were any
564+
rm -rf "$HOME/.nuget/packages"
563565
fi
564566
}
565567

@@ -650,7 +652,6 @@ if [ "$excludeLocalTests" == "false" ]; then
650652
fi
651653
echo "RUN ALL TESTS - LOCAL RESTORE SOURCE"
652654
runAllTests
653-
copyRestoredPackages
654655
echo "LOCAL RESTORE SOURCE - ALL TESTS PASSED!"
655656
fi
656657

0 commit comments

Comments
 (0)