File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,8 @@ phases:
93
93
condition : and(succeeded(), eq(variables['buildOfflineTarball'], true))
94
94
95
95
# run smoke tests
96
- - script : $(docker.runInTarball) $(imageName) ./smoke-test.sh --minimal --projectOutput --configuration $(buildConfiguration)
96
+ - script : $(docker.runInTarball) $(imageName) ./smoke-test.sh --minimal --projectOutput --configuration $(buildConfiguration) --prodConBlobFeedUrl ''
97
+ displayName : Run smoke-test in tarball
97
98
condition : and(succeeded(), eq(variables['buildOfflineTarball'], true))
98
99
99
100
# copy all tarball logs to working directory
Original file line number Diff line number Diff line change @@ -42,10 +42,10 @@ function usage() {
42
42
echo " --excludeLocalTests exclude tests that use local sources for nuget packages"
43
43
echo " --excludeOnlineTests exclude test that use online sources for nuget packages"
44
44
echo " --devCertsVersion <version> use dotnet-dev-certs <version> instead of default $DEV_CERTS_VERSION_DEFAULT "
45
- echo " --prodConBlobFeedUrl <url> override the prodcon blob feed specified in ProdConFeed.txt"
45
+ echo " --prodConBlobFeedUrl <url> override the prodcon blob feed specified in ProdConFeed.txt, removing it if empty "
46
46
echo " --archiveRestoredPackages capture all restored packages to $archivedPackagesDir "
47
47
echo " environment:"
48
- echo " prodConBlobFeedUrl override the prodcon blob feed specified in ProdConFeed.txt"
48
+ echo " prodConBlobFeedUrl override the prodcon blob feed specified in ProdConFeed.txt, removing it if empty "
49
49
echo " "
50
50
}
51
51
@@ -267,7 +267,11 @@ function resetCaches() {
267
267
}
268
268
269
269
function setupProdConFeed() {
270
- sed -i.bakProdCon " s|PRODUCT_CONTRUCTION_PACKAGES|$prodConBlobFeedUrl |g" " $testingDir /NuGet.Config"
270
+ if [ " $prodConBlobFeedUrl " ]; then
271
+ sed -i.bakProdCon " s|PRODUCT_CONTRUCTION_PACKAGES|$prodConBlobFeedUrl |g" " $testingDir /NuGet.Config"
272
+ else
273
+ sed -i.bakProdCon " /PRODUCT_CONTRUCTION_PACKAGES/d" " $testingDir /NuGet.Config"
274
+ fi
271
275
}
272
276
273
277
function setupSmokeTestFeed() {
You can’t perform that action at this time.
0 commit comments