diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 0e1fabbf3..ee4c5c7c9 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -299,13 +299,13 @@ { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1" + "{{ template_dir }}/scripts/Installers/Install-7zip.ps1" ] }, { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-7zip.ps1" + "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1" ] }, { diff --git a/images/win/scripts/Installers/Install-AliyunCli.ps1 b/images/win/scripts/Installers/Install-AliyunCli.ps1 index 37650046c..6172f4bc6 100644 --- a/images/win/scripts/Installers/Install-AliyunCli.ps1 +++ b/images/win/scripts/Installers/Install-AliyunCli.ps1 @@ -3,6 +3,18 @@ ## Desc: Install Alibaba Cloud CLI ################################################################################ -Choco-Install -PackageName aliyun-cli +Write-Host "Download Latest aliyun-cli archive" +$url = 'https://api.github.com/repos/aliyun/aliyun-cli/releases/latest' +# Explicitly set type to string since match returns array by default +[System.String] $aliyunLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "aliyun-cli-windows" +$aliyunArchivePath = Start-DownloadWithRetry -Url $aliyunLatest -Name "aliyun-cli.zip" + +Write-Host "Expand aliyun-cli archive" +$aliyunPath = "C:\aliyun-cli" +New-Item -Path $aliyunPath -ItemType Directory -Force +Extract-7Zip -Path $aliyunArchivePath -DestinationPath $aliyunPath + +# Add aliyun-cli to path +Add-MachinePathItem $aliyunPath Invoke-PesterTests -TestFile "Tools" -TestName "AliyunCli" \ No newline at end of file