Revert "Added Az 3.1.0 in hosted image"

This reverts commit 125779e366.
This commit is contained in:
Shady Ibraheem
2019-12-18 17:42:05 -05:00
parent 4764b88953
commit 0ff0999130
7 changed files with 2 additions and 74 deletions

View File

@@ -231,7 +231,6 @@ the
- Az Module (1.6.0) - Az Module (1.6.0)
- Az Module (2.3.2) - Az Module (2.3.2)
- Az Module (2.6.0) - Az Module (2.6.0)
- Az Module (3.1.0)
- Cached container images - Cached container images
- node:10 (Digest: sha256:be69034700545030c110f67ae22e0584ddd59eeb2af81e4bd7f16f3ba5fa93a6) - node:10 (Digest: sha256:be69034700545030c110f67ae22e0584ddd59eeb2af81e4bd7f16f3ba5fa93a6)
- node:12 (Digest: sha256:88ee7d2a5e18d359b4b5750ecb50a9b238ab467397c306aeb9955f4f11be44ce) - node:12 (Digest: sha256:88ee7d2a5e18d359b4b5750ecb50a9b238ab467397c306aeb9955f4f11be44ce)

View File

@@ -223,7 +223,6 @@ the
- Az Module (1.6.0) - Az Module (1.6.0)
- Az Module (2.3.2) - Az Module (2.3.2)
- Az Module (2.6.0) - Az Module (2.6.0)
- Az Module (3.1.0)
- Cached container images - Cached container images
- node:10 (Digest: sha256:be69034700545030c110f67ae22e0584ddd59eeb2af81e4bd7f16f3ba5fa93a6) - node:10 (Digest: sha256:be69034700545030c110f67ae22e0584ddd59eeb2af81e4bd7f16f3ba5fa93a6)
- node:12 (Digest: sha256:88ee7d2a5e18d359b4b5750ecb50a9b238ab467397c306aeb9955f4f11be44ce) - node:12 (Digest: sha256:88ee7d2a5e18d359b4b5750ecb50a9b238ab467397c306aeb9955f4f11be44ce)

View File

@@ -13,7 +13,6 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -Requi
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.1.0 -RequiredVersion 3.1.0 -Force'
# Run tests to determine that the software installed as expected # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -41,11 +40,6 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
if (!(get-module -listavailable -name Az.accounts)) { if (!(get-module -listavailable -name Az.accounts)) {
Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1 Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
} }
$env:PSModulePath = $actualPSModulePath
$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.1.0:" + $env:PSModulePath;
if (!(get-module -listavailable -name Az.accounts)) {
Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
}
$env:PSModulePath = $actualPSModulePath'; then $env:PSModulePath = $actualPSModulePath'; then
exit 1 exit 1
fi fi
@@ -57,4 +51,3 @@ DocumentInstalledItem "Az Module (1.6.0)"
DocumentInstalledItem "Az Module (2.3.2)" DocumentInstalledItem "Az Module (2.3.2)"
DocumentInstalledItem "Az Module (2.6.0)" DocumentInstalledItem "Az Module (2.6.0)"
DocumentInstalledItem "Az Module (2.8.0)" DocumentInstalledItem "Az Module (2.8.0)"
DocumentInstalledItem "Az Module (3.1.0)"

View File

@@ -13,7 +13,6 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -Requi
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force' sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.1.0 -RequiredVersion 3.1.0 -Force'
# Run tests to determine that the software installed as expected # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -41,11 +40,6 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
if (!(get-module -listavailable -name Az.accounts)) { if (!(get-module -listavailable -name Az.accounts)) {
Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1 Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
} }
$env:PSModulePath = $actualPSModulePath
$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.1.0:" + $env:PSModulePath;
if (!(get-module -listavailable -name Az.accounts)) {
Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
}
$env:PSModulePath = $actualPSModulePath'; then $env:PSModulePath = $actualPSModulePath'; then
exit 1 exit 1
fi fi
@@ -57,4 +51,3 @@ DocumentInstalledItem "Az Module (1.6.0)"
DocumentInstalledItem "Az Module (2.3.2)" DocumentInstalledItem "Az Module (2.3.2)"
DocumentInstalledItem "Az Module (2.6.0)" DocumentInstalledItem "Az Module (2.6.0)"
DocumentInstalledItem "Az Module (2.8.0)" DocumentInstalledItem "Az Module (2.8.0)"
DocumentInstalledItem "Az Module (3.1.0)"

View File

@@ -353,34 +353,6 @@ This version is saved but not installed
_Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1 _Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1
## Az Powershell modules
#### 1.0.0
This version is saved but not installed
_Location:_ C:\Modules\az_1.0.0\Az\1.0.0\Az.psd1
#### 1.6.0
This version is saved but not installed
_Location:_ C:\Modules\az_1.6.0\Az\1.6.0\Az.psd1
#### 2.3.2
This version is saved but not installed
_Location:_ C:\Modules\az_2.3.2\Az\2.3.2\Az.psd1
#### 2.6.0
This version is saved but not installed
_Location:_ C:\Modules\az_2.6.0\Az\2.6.0\Az.psd1
#### 3.1.0
This version is saved but not installed
_Location:_ C:\Modules\az_3.1.0\Az\3.1.0\Az.psd1
## TLS12 ## TLS12
_Version:_ 1.2<br/> _Version:_ 1.2<br/>

View File

@@ -325,34 +325,6 @@ This version is saved but not installed
_Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1 _Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1
## Az Powershell modules
#### 1.0.0
This version is saved but not installed
_Location:_ C:\Modules\az_1.0.0\Az\1.0.0\Az.psd1
#### 1.6.0
This version is saved but not installed
_Location:_ C:\Modules\az_1.6.0\Az\1.6.0\Az.psd1
#### 2.3.2
This version is saved but not installed
_Location:_ C:\Modules\az_2.3.2\Az\2.3.2\Az.psd1
#### 2.6.0
This version is saved but not installed
_Location:_ C:\Modules\az_2.6.0\Az\2.6.0\Az.psd1
#### 3.1.0
This version is saved but not installed
_Location:_ C:\Modules\az_3.1.0\Az\3.1.0\Az.psd1
## TLS12 ## TLS12
_Version:_ 1.2<br/> _Version:_ 1.2<br/>

View File

@@ -162,7 +162,7 @@ $extractLocation = "C:\Modules"
$azurePsUri = @( $azurePsUri = @(
"https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzurePSModules.M157.20190808.27979.zip", "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzurePSModules.M157.20190808.27979.zip",
"https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzureRmPSModules.M157.20190808.27379.zip", "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzureRmPSModules.M157.20190808.27379.zip",
"https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzPSModules.M163.20191211.17769.zip" "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzPSModules.M158.20190903.19326.zip"
) )
$azureRMModulePath = "C:\Modules\azurerm_2.1.0" $azureRMModulePath = "C:\Modules\azurerm_2.1.0"