Fix release pipeline (#1574)

* Copy bits to 3.0.3-BETA.2-HEYA-TEST container on azure blob

* Add more logs

* Add check to download 64bit or 32bit 7-Zip

* Add a check to install 64bit vs. 32bit azcopy

* Install 3rd party softwares to D drive

* Don't use 7-Zip to unzip azcopy

* Add a new param called JarPath

* Clean up

* Revert Version back to 3.0.3-BETA.2

Author: heyams

.scripts/copyBitsToAzureBlob.ps1

@@ -7,12 +7,17 @@ param (
     [ValidateNotNullOrEmpty()]
     [string]$ServicePrincipleClientId,
 
+    [Parameter(Mandatory=$true, HelpMessage="Jar location")]
+    [ValidateNotNullOrEmpty()]
+    [string]$JarPath,
+
     [Parameter(Mandatory=$true, HelpMessage="applicationinsights-java version")]
     [ValidateNotNullOrEmpty()]
     [string]$SDKVersionNumber
 )
 
+Write-Host "Jar path: $JarPath"
 $Env:AZCOPY_SPA_CLIENT_SECRET=$ServicePrincipalKey
 azcopy login --service-principal --application-id $ServicePrincipleClientId
-azcopy copy "$(System.DefaultWorkingDirectory)/_applicationinsights-java-Windows-Official-master/drop/outputs/build/Artifacts/agent/agent/build/libs/applicationinsights-agent-$SDKVersionNumber.jar" "https://azuresdkpartnerdrops.blob.core.windows.net/drops/applicationinsights-sdk/java/$SDKVersionNumber/"
+azcopy copy "$JarPath/applicationinsights-agent-$SDKVersionNumber.jar" "https://azuresdkpartnerdrops.blob.core.windows.net/drops/applicationinsights-sdk/java/$SDKVersionNumber/"
 Remove-Item Env:AZCOPY_SPA_CLIENT_SECRET

.scripts/generateVersion.ps1

@@ -12,4 +12,4 @@ $date = Get-Date -UFormat "%Y%m%d"
 $revision = "$date$env:CDP_DEFINITION_BUILD_COUNT_DAY"
 $buildNumber = "$major.$minor.$patch.$revision"
 [Environment]::SetEnvironmentVariable("CustomBuildNumber", $buildNumber, "User")  # This will allow you to use it from env var in later steps of the same phase
-Write-Host "##vso[build.updatebuildnumber]${buildNumber}"
+Write-Host "##vso[build.updatebuildnumber]${buildNumber}"

.scripts/install-azcopy.ps1

@@ -49,32 +49,11 @@ try
         }
     }
 
-    if ($SkipUnzip)
+    if (-not $SkipUnzip)
     {
-        if($Destination.ToString() -eq "C:\7-Zip") {
-            Start-Process -Wait -FilePath "$Source" -ArgumentList "/S"
-        }
-    }
-    else
-    {
-        if ($PathTo7Zip)
-        {
-            Write-Host "***"
-            Write-Host $PathTo7Zip.ToString()
-            Write-Host "***"
-            if (-not (Test-Path $PathTo7Zip))
-            {
-                Write-Error "7zip location still does not exist $PathTo7Zip"
-                exit
-            }
-            Expand-ArchiveWith7Zip -Source $Source -Destination $destination -ToolPath $PathTo7Zip
-        }
-        else
-        {
-            Write-Host "$PathTo7Zip does not exist"
-            Expand-ArchiveWith7Zip -Source $Source -Destination $destination
-        }
-        Write-Host "Finished unzipping to $destination"
+         Write-Host "Unzipping $Source to $Destination"
+         Expand-Archive -LiteralPath $Source -Destination $Destination -Force
+         Write-Host "Finished unzipping to $Destination"
     }
 }
 finally

.scripts/install7zipexe.cmd

@@ -2,14 +2,19 @@
 
 echo "Installing AzCopy V10 Windows..."
 
-set ZIP_URL=https://azcopyvnext.azureedge.net/release20210226/azcopy_windows_amd64_10.9.0.zip
+set ZIP_URL_64=https://azcopyvnext.azureedge.net/release20210226/azcopy_windows_amd64_10.9.0.zip
+set ZIP_URL_32=https://azcopyvnext.azureedge.net/release20210226/azcopy_windows_386_10.9.0.zip
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
 
-powershell -NoProfile -ExecutionPolicy Unrestricted -File "%~dp0install-azcopy.ps1" -Url "%ZIP_URL%" -Destination "C:\Program Files\AzCopy" -UpdatePath -PathTo7Zip "C:\7-Zip\7z.exe" -CleanOnFinish || exit /B 1
+if %OS%==64BIT (
+    powershell -NoProfile -ExecutionPolicy Unrestricted -File "%~dp0install-azcopy.ps1" -Url "%ZIP_URL_64%" -Destination "C:\Program Files\AzCopy" -UpdatePath -CleanOnFinish || exit /B 1
+) else (
+    powershell -NoProfile -ExecutionPolicy Unrestricted -File "%~dp0install-azcopy.ps1" -Url "%ZIP_URL_32%" -Destination "C:\Program Files\AzCopy" -UpdatePath -CleanOnFinish || exit /B 1
+)
 
-echo "C:\Program Files\AzCopy"
-dir "C:\Program Files\AzCopy"
+IF EXIST "C:\Program Files\AzCopy\azcopy_windows_amd64_10.9.0\azcopy.exe" (
+    echo "AzCopy v10.9.0 was installed Successfully."
+) ELSE (
+    echo "ERROR: Failed to install AzCopy v10.9.0."
+)
 
-echo "C:\Program Files\AzCopy\azcopy_windows_amd64_10.9.0"
-dir "C:\Program Files\AzCopy\azcopy_windows_amd64_10.9.0"
-
-echo "Installed AzCopy v10.9.0 Successfully."