actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Remove azcopy 7 (#2779)

Browse Source 
* remove azcopy 7 installation

* Fix software report generator

* fix variable name

* add install helper
This commit is contained in:
Mikhail Timofeev
2021-02-24 18:21:51 +03:00
committed by GitHub
parent 5bf71738f0
commit 5afe6fcc4e
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -90,8 +90,7 @@ $toolsList = @(
(Get-7zipVersion), (Get-7zipVersion),
(Get-AnsibleVersion), (Get-AnsibleVersion),
(Get-AptFastVersion), (Get-AptFastVersion),
(Get-AzCopy7Version), (Get-AzCopyVersion),
(Get-AzCopy10Version),
(Get-BazelVersion), (Get-BazelVersion),
(Get-BazeliskVersion), (Get-BazeliskVersion),
(Get-BinUtilsVersion), (Get-BinUtilsVersion),

11
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -13,14 +13,9 @@ function Get-AptFastVersion {
return "apt-fast $aptFastVersion" return "apt-fast $aptFastVersion"
} }
function Get-AzCopy7Version { function Get-AzCopyVersion {
$azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" $azcopyVersion = azcopy --version | Take-OutputPart -Part 2
return "AzCopy7 $azcopy7Version (available by ``azcopy`` alias)" return "AzCopy $azcopyVersion (available by ``azcopy`` and ``azcopy10`` aliases)"
}
function Get-AzCopy10Version {
$azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2
return "AzCopy10 $azcopy10Version (available by ``azcopy10`` alias)"
} }
function Get-BazelVersion { function Get-BazelVersion {

14
images/linux/scripts/installers/azcopy.sh
View File

@@ -4,16 +4,14 @@
## Desc: Installs AzCopy ## Desc: Installs AzCopy
################################################################################ ################################################################################
# Install AzCopy7 source $HELPER_SCRIPTS/install.sh
wget -O azcopy.tar.gz https://aka.ms/downloadazcopylinux64
tar -xf azcopy.tar.gz
rm azcopy.tar.gz
./install.sh
# Install AzCopy10 # Install AzCopy10
wget -O /tmp/azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux download_with_retries "https://aka.ms/downloadazcopy-v10-linux" "/tmp" "azcopy.tar.gz"
tar zxvf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp tar zxvf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp
mv /tmp/azcopy /usr/local/bin/azcopy10 mv /tmp/azcopy /usr/local/bin/azcopy
chmod +x /usr/local/bin/azcopy10 chmod +x /usr/local/bin/azcopy
# Create azcopy 10 alias for backward compatibility
ln -sf /usr/local/bin/azcopy /usr/local/bin/azcopy10
invoke_tests "Tools" "azcopy" invoke_tests "Tools" "azcopy"

6
images/linux/scripts/tests/Tools.Tests.ps1
View File

@@ -1,11 +1,9 @@
Describe "azcopy" { Describe "azcopy" {
It "azcopy" { It "azcopy" {
#(azcopy --version) command returns exit code 1 (see details: https://github.com/Azure/azure-storage-azcopy/releases) "azcopy --version" | Should -ReturnZeroExitCode
$azcopyVersion = (Get-CommandResult "azcopy --version").Output
$azcopyVersion | Should -BeLike "*azcopy*"
} }
It "azcopy10" { It "azcopy10 link exists" {
"azcopy10 --version" | Should -ReturnZeroExitCode "azcopy10 --version" | Should -ReturnZeroExitCode
} }
} }