Merged PR 130918: Fix smoke-test.sh; export prebuilt reports as artifacts

Author: dagood

.vsts-ci.yml

@@ -103,6 +103,9 @@ phases:
         $(docker.runInTarball) -v $(dropDirectory)/logs:/logs $(imageName) /bin/bash -c "mkdir -p /logs/tarball/binlogs; find . -name '*.binlog' -exec cp {} /logs/tarball/binlogs \;"
         $(docker.runInTarball) -v $(dropDirectory)/logs:/logs $(imageName) /bin/bash -c "mkdir -p /logs/tarball/logs; find ./bin/logs -name '*.log' -exec cp {} /logs/tarball/logs \;"
         $(docker.runInTarball) -v $(dropDirectory)/logs:/logs $(imageName) /bin/bash -c "mkdir -p /logs/tarball/smoke-test; find ./testing-smoke -name '*.log' -exec cp {} /logs/tarball/smoke-test \;"
+        # Copy prebuilt report
+        $(docker.runInSourceBuild) -v $(dropDirectory)/logs:/logs $(imageName) /bin/bash -c "mkdir -p /logs/prebuilt-report/online;  cp -r ./bin/prebuilt-report/* /logs/prebuilt-report/online"
+        $(docker.runInTarball)     -v $(dropDirectory)/logs:/logs $(imageName) /bin/bash -c "mkdir -p /logs/prebuilt-report/offline; cp -r ./bin/prebuilt-report/* /logs/prebuilt-report/offline"
       displayName: Copy tarball logs
       condition: eq(variables['buildOfflineTarball'], true)
       continueOnError: true

smoke-test.sh

@@ -22,7 +22,6 @@ cliDir="$testingDir/builtCli"
 logFile="$testingDir/smoke-test.log"
 restoredPackagesDir="$testingDir/packages"
 testingHome="$testingDir/home"
-prodConBlobFeedUrl=${prodConBlobFeedUrl-}
 archiveRestoredPackages=false
 archivedPackagesDir="$testingDir/smoke-test-packages"
 smokeTestPrebuilts="$SCRIPT_ROOT/prebuilt/smoke-test-packages"
@@ -115,6 +114,7 @@ while :; do
     shift
 done
 
+prodConBlobFeedUrl="${prodConBlobFeedUrl-$(cat "$SCRIPT_ROOT/ProdConFeed.txt")}"
 
 function doCommand() {
     lang=$1
@@ -319,7 +319,6 @@ fi
 # setup restore path
 export NUGET_PACKAGES="$restoredPackagesDir"
 SOURCE_BUILT_PKGS_PATH="$SCRIPT_ROOT/bin/obj/x64/$configuration/blob-feed/packages/"
-prodConBlobFeedUrl="${prodConBlobFeedUrl:-$(cat "$SCRIPT_ROOT/ProdConFeed.txt")}"
 
 # Run all tests, local restore sources first, online restore sources second
 if [ "$excludeLocalTests" == "false" ]; then