From 9b52e4043f96d7d6871cc7903271e328207f3c58 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Fri, 14 Feb 2020 19:09:09 +0300 Subject: [PATCH 001/106] Configure yml files for the images --- .../azure-pipelines/image-generation.yml | 29 +++++++++++++ images.CI/azure-pipelines/ubuntu1604.yml | 22 ++++++++++ images.CI/azure-pipelines/ubuntu1804.yml | 22 ++++++++++ images.CI/azure-pipelines/windows2016.yml | 22 ++++++++++ images.CI/azure-pipelines/windows2019.yml | 22 ++++++++++ images.CI/build-image.ps1 | 41 +++++++++++++++++++ images.CI/cleanup.ps1 | 25 +++++++++++ 7 files changed, 183 insertions(+) create mode 100644 images.CI/azure-pipelines/image-generation.yml create mode 100644 images.CI/azure-pipelines/ubuntu1604.yml create mode 100644 images.CI/azure-pipelines/ubuntu1804.yml create mode 100644 images.CI/azure-pipelines/windows2016.yml create mode 100644 images.CI/azure-pipelines/windows2019.yml create mode 100644 images.CI/build-image.ps1 create mode 100644 images.CI/cleanup.ps1 diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml new file mode 100644 index 00000000..373c7500 --- /dev/null +++ b/images.CI/azure-pipelines/image-generation.yml @@ -0,0 +1,29 @@ +jobs: +- job: + pool: ci-agent-pool + steps: + - script: | + ./images.CI/build-image.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -Image ${{ parameters.image_type }} ` + -ResourceGroup $(AZURE_RESOURCE_GROUP) ` + -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -TenantId $(AZURE_TENANT) ` + -Location $(AZURE_LOCATION) ` + -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` + -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` + -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` + -GitHubFeedToken $(GITHUB_TOKEN) + displayName: Build VM + + - script: | + ./images.CI/cleanup.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -Image ${{ parameters.image_type }} ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -TenantId $(AZURE_TENANT) + displayName: Clean up resources + condition: always() \ No newline at end of file diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml new file mode 100644 index 00000000..c76a3924 --- /dev/null +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu1604 \ No newline at end of file diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml new file mode 100644 index 00000000..eb7c6dd0 --- /dev/null +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu1804 \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml new file mode 100644 index 00000000..d3ac23e6 --- /dev/null +++ b/images.CI/azure-pipelines/windows2016.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: Windows2016-Azure \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml new file mode 100644 index 00000000..93c73003 --- /dev/null +++ b/images.CI/azure-pipelines/windows2019.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: Windows2019-Azure \ No newline at end of file diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 new file mode 100644 index 00000000..1087abbe --- /dev/null +++ b/images.CI/build-image.ps1 @@ -0,0 +1,41 @@ +param( + [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] + [String] [Parameter (Mandatory=$true)] $Image, + [String] [Parameter (Mandatory=$true)] $ClientId, + [String] [Parameter (Mandatory=$true)] $ClientSecret, + [String] [Parameter (Mandatory=$true)] $GitHubFeedToken, + [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $Location, + [String] [Parameter (Mandatory=$true)] $ResourceGroup, + [String] [Parameter (Mandatory=$true)] $StorageAccount, + [String] [Parameter (Mandatory=$true)] $SubscriptionId, + [String] [Parameter (Mandatory=$true)] $TenantId, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkName, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkRG, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkSubnet +) + +$TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName +$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" +$InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() + +Write-Host "TemplatePath = $TemplatePath" +Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" +Write-Host "TempResourceGroupName = $TempResourceGroupName" + +Write-Host "Build $Image VM" +packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` + -var "client_id=$ClientId" ` + -var "client_secret=$ClientSecret" ` + -var "install_password=$InstallPassword" ` + -var "github_feed_token=$GitHubFeedToken" ` + -var "location=$Location" ` + -var "resource_group=$ResourceGroup" ` + -var "storage_account=$StorageAccount" ` + -var "subscription_id=$SubscriptionId" ` + -var "temp_resource_group_name=$TempResourceGroupName" ` + -var "tenant_id=$TenantId" ` + -var "virtual_network_name=$VirtualNetworkName" ` + -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` + -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` + $TemplatePath \ No newline at end of file diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 new file mode 100644 index 00000000..fcf7d946 --- /dev/null +++ b/images.CI/cleanup.ps1 @@ -0,0 +1,25 @@ +param( + [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] + [String] [Parameter (Mandatory=$true)] $Image, + [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $ClientId, + [String] [Parameter (Mandatory=$true)] $ClientSecret, + [String] [Parameter (Mandatory=$true)] $SubscriptionId, + [String] [Parameter (Mandatory=$true)] $TenantId +) + +az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null + +$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" + +Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" +Write-Host "TempResourceGroupName = $TempResourceGroupName" + +$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId | Out-Null +if ($groupExist -eq "true") { + Write-Host "Found a match, deleting temporary files" + az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null + Write-Host "Temporary group was deleted succesfully" -ForegroundColor Green +} else { + Write-Host "No temporary groups found" +} \ No newline at end of file From 78ce3a0bd3b903f540b18829e2c83574ddeeafbb Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Fri, 14 Feb 2020 19:44:06 +0300 Subject: [PATCH 002/106] Change the script steps to the PowerShell tasks --- .../azure-pipelines/image-generation.yml | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 373c7500..98922bf0 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -2,8 +2,12 @@ jobs: - job: pool: ci-agent-pool steps: - - script: | - ./images.CI/build-image.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + - task: PowerShell@2 + displayName: 'Build VM' + inputs: + targetType: filePath + filePath: ./images.CI/build-image.ps1 + arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` @@ -16,14 +20,16 @@ jobs: -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` -GitHubFeedToken $(GITHUB_TOKEN) - displayName: Build VM - - script: | - ./images.CI/cleanup.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + - task: PowerShell@2 + displayName: 'Clean up resources' + condition: always() + inputs: + targetType: filePath + filePath: ./images.CI/cleanup.ps1 + arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -TenantId $(AZURE_TENANT) - displayName: Clean up resources - condition: always() \ No newline at end of file + -TenantId $(AZURE_TENANT) \ No newline at end of file From 0295b6f57eb5865b228587685b557d19839d7e77 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Sat, 15 Feb 2020 20:52:05 +0300 Subject: [PATCH 003/106] Move variables group --- images.CI/azure-pipelines/image-generation.yml | 4 ++++ images.CI/azure-pipelines/ubuntu1604.yml | 3 --- images.CI/azure-pipelines/ubuntu1804.yml | 3 --- images.CI/azure-pipelines/windows2016.yml | 3 --- images.CI/azure-pipelines/windows2019.yml | 3 --- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 98922bf0..2f9840b6 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -1,6 +1,10 @@ jobs: - job: pool: ci-agent-pool + timeoutInMinutes: 600 + variables: + - group: Image Generation Variables + steps: - task: PowerShell@2 displayName: 'Build VM' diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml index c76a3924..b19e79a1 100644 --- a/images.CI/azure-pipelines/ubuntu1604.yml +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml index eb7c6dd0..db8acfd9 100644 --- a/images.CI/azure-pipelines/ubuntu1804.yml +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml index d3ac23e6..eaac2d1b 100644 --- a/images.CI/azure-pipelines/windows2016.yml +++ b/images.CI/azure-pipelines/windows2016.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml index 93c73003..ebbf68e7 100644 --- a/images.CI/azure-pipelines/windows2019.yml +++ b/images.CI/azure-pipelines/windows2019.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true From 624b905bc9e125cc3f38cbea9f53c06b0f028eab Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 13:48:05 +0300 Subject: [PATCH 004/106] Remove log messages --- images.CI/build-image.ps1 | 4 ---- images.CI/cleanup.ps1 | 3 --- 2 files changed, 7 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 1087abbe..989167e4 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -19,10 +19,6 @@ $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -D $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() -Write-Host "TemplatePath = $TemplatePath" -Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" -Write-Host "TempResourceGroupName = $TempResourceGroupName" - Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 index fcf7d946..4b0b527b 100644 --- a/images.CI/cleanup.ps1 +++ b/images.CI/cleanup.ps1 @@ -12,9 +12,6 @@ az login --service-principal --username $ClientId --password $ClientSecret --ten $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" -Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" -Write-Host "TempResourceGroupName = $TempResourceGroupName" - $groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId | Out-Null if ($groupExist -eq "true") { Write-Host "Found a match, deleting temporary files" From 9b8fe11d2cb0dd83fe3405c445d36bcbb3bd1390 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 17:25:55 +0300 Subject: [PATCH 005/106] Remove ValidateSet --- images.CI/build-image.ps1 | 9 ++++++++- images.CI/cleanup.ps1 | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 989167e4..9a35373d 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -1,5 +1,4 @@ param( - [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] [String] [Parameter (Mandatory=$true)] $Image, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, @@ -16,9 +15,17 @@ param( ) $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName +if ($TemplatePath -eq $null) +{ + Write-Error "'-Image' parameter is not valid. You have to specify correct image type." + exit 1 +} + $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() +packer validate -syntax-only $TemplatePath + Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 index 4b0b527b..00050d55 100644 --- a/images.CI/cleanup.ps1 +++ b/images.CI/cleanup.ps1 @@ -1,5 +1,4 @@ param( - [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] [String] [Parameter (Mandatory=$true)] $Image, [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, [String] [Parameter (Mandatory=$true)] $ClientId, From 60dc082e2fc2edc7a70923f258699fc85869b8f2 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 17:31:08 +0300 Subject: [PATCH 006/106] Minor update --- images.CI/build-image.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 9a35373d..6b75ec28 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -15,7 +15,7 @@ param( ) $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName -if ($TemplatePath -eq $null) +if (-not $TemplatePath) { Write-Error "'-Image' parameter is not valid. You have to specify correct image type." exit 1 From 6aeaad42ea055ec3720666015c910750e7d454b0 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Tue, 18 Feb 2020 15:37:23 +0300 Subject: [PATCH 007/106] Add step with download custom repository --- images.CI/azure-pipelines/image-generation.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 2f9840b6..459b55c3 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -6,6 +6,13 @@ jobs: - group: Image Generation Variables steps: + - pwsh: | + Remove-Item -path './*' -Recurse -Force + Write-Host "Download $(BRANCH_NAME) branch from $(IMAGE_GEN_REPO_URI)" + git clone $(IMAGE_GEN_REPO_URI) . -b $(BRANCH_NAME) --single-branch --depth 1 + displayName: 'Download custom repository' + condition: and(ne(variables['BRANCH_NAME'], ''), ne(variables['IMAGE_GEN_REPO_URI'], '')) + - task: PowerShell@2 displayName: 'Build VM' inputs: From b1a3c37984d814d4a1ecb39b5cf4932c773727dc Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Tue, 18 Feb 2020 16:50:11 +0300 Subject: [PATCH 008/106] Add logs filter --- images.CI/build-image.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 6b75ec28..dabbb069 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -26,6 +26,8 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() packer validate -syntax-only $TemplatePath +$SensitiveData = @('OSType', 'StorageAccountLocation', 'OSDiskUri', 'OSDiskUriReadOnlySas', 'TemplateUri', 'TemplateUriReadOnlySas', ': ->') + Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` @@ -41,4 +43,10 @@ packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "virtual_network_name=$VirtualNetworkName" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` - $TemplatePath \ No newline at end of file + $TemplatePath ` + | Where-Object { + #Filter sensitive data from Packer logs + $currentString = $_ + $matchedString = $SensitiveData | Where-Object { $currentString -match $_ } + return $matchedString -eq $null + } \ No newline at end of file From 9c41221b9ba903c48bb94173e0a9022d5d865b54 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Tue, 18 Feb 2020 17:05:00 +0300 Subject: [PATCH 009/106] Minor updates --- images.CI/build-image.ps1 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index dabbb069..73455c02 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -26,7 +26,13 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() packer validate -syntax-only $TemplatePath -$SensitiveData = @('OSType', 'StorageAccountLocation', 'OSDiskUri', 'OSDiskUriReadOnlySas', 'TemplateUri', 'TemplateUriReadOnlySas', ': ->') +$SensitiveData = @('OSType', + 'StorageAccountLocation', + 'OSDiskUri', + 'OSDiskUriReadOnlySas', + 'TemplateUri', + 'TemplateUriReadOnlySas', + ': ->') Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` @@ -47,6 +53,6 @@ packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` | Where-Object { #Filter sensitive data from Packer logs $currentString = $_ - $matchedString = $SensitiveData | Where-Object { $currentString -match $_ } - return $matchedString -eq $null + $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ } + $sensitiveString -eq $null } \ No newline at end of file From f4bd0f2a6a7b6d72f6570b5ac3a873c4b8de85b8 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Tue, 18 Feb 2020 17:09:48 +0300 Subject: [PATCH 010/106] Minor update --- images.CI/build-image.ps1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 73455c02..54748e41 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -26,13 +26,15 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() packer validate -syntax-only $TemplatePath -$SensitiveData = @('OSType', - 'StorageAccountLocation', - 'OSDiskUri', - 'OSDiskUriReadOnlySas', - 'TemplateUri', - 'TemplateUriReadOnlySas', - ': ->') +$SensitiveData = @( + 'OSType', + 'StorageAccountLocation', + 'OSDiskUri', + 'OSDiskUriReadOnlySas', + 'TemplateUri', + 'TemplateUriReadOnlySas', + ': ->' +) Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` From 33a765dcc51a12204bbc89906f1217715b838542 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Tue, 18 Feb 2020 17:19:11 +0300 Subject: [PATCH 011/106] Change pwsh step to powershell step --- images.CI/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 459b55c3..bab1c1c8 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -6,7 +6,7 @@ jobs: - group: Image Generation Variables steps: - - pwsh: | + - powershell: | Remove-Item -path './*' -Recurse -Force Write-Host "Download $(BRANCH_NAME) branch from $(IMAGE_GEN_REPO_URI)" git clone $(IMAGE_GEN_REPO_URI) . -b $(BRANCH_NAME) --single-branch --depth 1 From cc8bdd738467c8803411af1e5571f8ba6b95d2a3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 09:56:16 +0400 Subject: [PATCH 012/106] dotnetcore-sdk.sh has been refactored for using in both Ubuntu 16/18 deployments --- .vscode/tasks.json | 50 +++------- images/linux/scripts/base/repos.sh | 6 +- .../scripts/installers/1804/dotnetcore-sdk.sh | 99 ------------------- .../installers/{1604 => }/dotnetcore-sdk.sh | 4 + images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- 6 files changed, 22 insertions(+), 141 deletions(-) delete mode 100644 images/linux/scripts/installers/1804/dotnetcore-sdk.sh rename images/linux/scripts/installers/{1604 => }/dotnetcore-sdk.sh (96%) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index da6002dd..744b2145 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,42 +1,14 @@ -// Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team -// ${file}: the current opened file -// ${relativeFile}: the current opened file relative to workspaceRoot -// ${fileBasename}: the current opened file's basename -// ${fileDirname}: the current opened file's dirname -// ${fileExtname}: the current opened file's extension -// ${cwd}: the current working directory of the spawned process { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - - // Start PowerShell - "windows": { - "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe", - //"command": "${env:ProgramFiles}/PowerShell/6.0.0/powershell.exe", - "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ] - }, - "linux": { - "command": "/usr/bin/powershell", - "args": [ "-NoProfile" ] - }, - "osx": { - "command": "/usr/local/bin/powershell", - "args": [ "-NoProfile" ] - }, - - // Associate with test task runner - "tasks": [ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ { - "taskName": "Test", - "suppressTaskName": true, - "isTestCommand": true, - "args": [ - "Write-Host 'Invoking Pester...'; $ProgressPreference = 'SilentlyContinue'; Invoke-Pester -Script test -PesterOption @{IncludeVSCodeMarker=$true};", - "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" - ], - "problemMatcher": "$pester" + "type": "bashdb", + "request": "launch", + "name": "Bash-Debug (simplest configuration)", + "program": "${file}" } - ] -} + ] +} \ No newline at end of file diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index f8280cc0..6c56d1ca 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,7 +9,11 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get update +apt-get install apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg +mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg +sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' +apt-get update \ No newline at end of file diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh deleted file mode 100644 index d1fb73ec..00000000 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -################################################################################ -## File: dotnetcore-sdk.sh -## Desc: Installs .NET Core SDK -################################################################################ - -source $HELPER_SCRIPTS/apt.sh -source $HELPER_SCRIPTS/document.sh - -LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") - -LSB_RELEASE=$(lsb_release -rs) - -mksamples() -{ - sdk=$1 - sample=$2 - mkdir "$sdk" - cd "$sdk" || exit - set -e - dotnet help - dotnet new globaljson --sdk-version "$sdk" - dotnet new "$sample" - dotnet restore - dotnet build - set +e - cd .. || exit - rm -rf "$sdk" -} - -set -e - -# Disable telemetry -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do - echo "Determing if .NET Core ($latest_package) is installed" - if ! IsInstalled $latest_package; then - echo "Could not find .NET Core ($latest_package), installing..." - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - apt-get install apt-transport-https - apt-get update - apt-get install $latest_package -y - else - echo ".NET Core ($latest_package) is already installed" - fi -done - -# Get list of all released SDKs from channels which are not end-of-life or preview -release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") -sdks=() -for release_url in ${release_urls[@]}; do - echo "${release_url}" - releases=$(curl "${release_url}") - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) -done - -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) - -for sdk in $sortedSdks; do - url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" - echo "$url" >> urls - echo "Adding $url to list to download later" -done - -# Download additional SDKs -echo "Downloading release tarballs..." -cat urls | xargs -n 1 -P 16 wget -q -for tarball in *.tar.gz; do - dest="./tmp-$(basename -s .tar.gz $tarball)" - echo "Extracting $tarball to $dest" - mkdir "$dest" && tar -C "$dest" -xzf "$tarball" - rsync -qav "$dest/shared/" /usr/share/dotnet/shared/ - rsync -qav "$dest/host/" /usr/share/dotnet/host/ - rsync -qav "$dest/sdk/" /usr/share/dotnet/sdk/ - rm -rf "$dest" - rm "$tarball" -done -rm urls - -DocumentInstalledItem ".NET Core SDK:" -# Smoke test each SDK -for sdk in $sortedSdks; do - mksamples "$sdk" "console" - mksamples "$sdk" "mstest" - mksamples "$sdk" "xunit" - mksamples "$sdk" "web" - mksamples "$sdk" "mvc" - mksamples "$sdk" "webapi" - DocumentInstalledItemIndent "$sdk" -done - -# NuGetFallbackFolder at /usr/share/dotnet/sdk/NuGetFallbackFolder is warmed up by smoke test -# Additional FTE will just copy to ~/.dotnet/NuGet which provides no benefit on a fungible machine -echo "DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" | tee -a /etc/environment -echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh similarity index 96% rename from images/linux/scripts/installers/1604/dotnetcore-sdk.sh rename to images/linux/scripts/installers/dotnetcore-sdk.sh index 7db72755..1d36ef97 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -4,6 +4,7 @@ ## Desc: Installs .NET Core SDK ################################################################################ +HELPER_SCRIPTS=/repos/virtual-environments/images/linux/scripts/helpers source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh @@ -30,6 +31,9 @@ mksamples() set -e +# Disable telemetry +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index f3b95f06..5bd28548 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -129,7 +129,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 5938c2aa..732de521 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -132,7 +132,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1804/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", From 02192d4fd6b97da61114896a2d64cdbf67502b50 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 10:11:28 +0400 Subject: [PATCH 013/106] Return to tasks.json from master branch --- .vscode/tasks.json | 48 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 744b2145..7827bd0e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,14 +1,42 @@ +// Available variables which can be used inside of strings. +// ${workspaceRoot}: the root folder of the team +// ${file}: the current opened file +// ${relativeFile}: the current opened file relative to workspaceRoot +// ${fileBasename}: the current opened file's basename +// ${fileDirname}: the current opened file's dirname +// ${fileExtname}: the current opened file's extension +// ${cwd}: the current working directory of the spawned process { - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + + // Start PowerShell + "windows": { + "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe", + //"command": "${env:ProgramFiles}/PowerShell/6.0.0/powershell.exe", + "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ] + }, + "linux": { + "command": "/usr/bin/powershell", + "args": [ "-NoProfile" ] + }, + "osx": { + "command": "/usr/local/bin/powershell", + "args": [ "-NoProfile" ] + }, + + // Associate with test task runner + "tasks": [ { - "type": "bashdb", - "request": "launch", - "name": "Bash-Debug (simplest configuration)", - "program": "${file}" + "taskName": "Test", + "suppressTaskName": true, + "isTestCommand": true, + "args": [ + "Write-Host 'Invoking Pester...'; $ProgressPreference = 'SilentlyContinue'; Invoke-Pester -Script test -PesterOption @{IncludeVSCodeMarker=$true};", + "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" + ], + "problemMatcher": "$pester" } - ] + ] } \ No newline at end of file From ae119feb62accd32611e5f1076816aa089188965 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 10:32:44 +0400 Subject: [PATCH 014/106] dotnetcore-sdk.sh - excess debug string has been removed --- images/linux/scripts/installers/dotnetcore-sdk.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 1d36ef97..88b6cb0a 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -3,8 +3,6 @@ ## File: dotnetcore-sdk.sh ## Desc: Installs .NET Core SDK ################################################################################ - -HELPER_SCRIPTS=/repos/virtual-environments/images/linux/scripts/helpers source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh From bff4ce772620dd5e77fc493411ac65d1d6e99760 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 11:15:04 +0400 Subject: [PATCH 015/106] Original tasks.json has been reverted --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7827bd0e..da6002dd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -39,4 +39,4 @@ "problemMatcher": "$pester" } ] -} \ No newline at end of file +} From 82bdea2dfe53bb63696e63fe5c6b92a0c87d13b6 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Wed, 19 Feb 2020 10:58:59 +0300 Subject: [PATCH 016/106] Update variables names --- images.CI/azure-pipelines/image-generation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index bab1c1c8..0c05a7e7 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -8,10 +8,10 @@ jobs: steps: - powershell: | Remove-Item -path './*' -Recurse -Force - Write-Host "Download $(BRANCH_NAME) branch from $(IMAGE_GEN_REPO_URI)" - git clone $(IMAGE_GEN_REPO_URI) . -b $(BRANCH_NAME) --single-branch --depth 1 + Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" + git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 displayName: 'Download custom repository' - condition: and(ne(variables['BRANCH_NAME'], ''), ne(variables['IMAGE_GEN_REPO_URI'], '')) + condition: and(ne(variables['CUSTOM_REPOSITORY_BRANCH'], ''), ne(variables['CUSTOM_REPOSITORY_URL'], '')) - task: PowerShell@2 displayName: 'Build VM' From 68bde6422205d1b7aea26258f3b0376ea7120b01 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Wed, 19 Feb 2020 14:30:44 +0300 Subject: [PATCH 017/106] Change step to PowerShell task --- images.CI/azure-pipelines/image-generation.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 0c05a7e7..477cdc5f 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -6,12 +6,15 @@ jobs: - group: Image Generation Variables steps: - - powershell: | - Remove-Item -path './*' -Recurse -Force - Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" - git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 + - task: PowerShell@2 displayName: 'Download custom repository' condition: and(ne(variables['CUSTOM_REPOSITORY_BRANCH'], ''), ne(variables['CUSTOM_REPOSITORY_URL'], '')) + inputs: + targetType: 'inline' + script: | + Remove-Item -path './*' -Recurse -Force + Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" + git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 - task: PowerShell@2 displayName: 'Build VM' From 28a081bda6220bd659bd2334bc521bb7021ee098 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Thu, 20 Feb 2020 13:49:38 +0400 Subject: [PATCH 018/106] Setting '-y' has been added to installation of apt-transport-https --- images/linux/scripts/base/repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index 6c56d1ca..abf4586e 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,7 +9,7 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get install apt-transport-https +apt-get install -y apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - From a3c8fe11533a3bc4cdc3c45ca145a5d4162858ae Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Thu, 20 Feb 2020 18:26:31 +0400 Subject: [PATCH 019/106] Adding the Ubuntu 18 repository has been revoved from repos.sh --- images/linux/scripts/base/repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index abf4586e..847101ae 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -13,7 +13,7 @@ apt-get install -y apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg -sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' apt-get update \ No newline at end of file From 56bc08104e91be4946effd0f070337a49f0dfb6f Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 20 Feb 2020 17:52:12 +0300 Subject: [PATCH 020/106] Add deployment step (#4) * add release step * add creation release * move file to another folder * resolve comments * minor changes --- .../azure-pipelines/image-generation.yml | 12 +++++++ images.CI/create-release.ps1 | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 images.CI/create-release.ps1 diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 477cdc5f..eb0136eb 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -35,6 +35,18 @@ jobs: -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` -GitHubFeedToken $(GITHUB_TOKEN) + - task: PowerShell@2 + displayName: 'Create release for VM deployment' + inputs: + targetType: filePath + filePath: ./images.CI/create-release.ps1 + arguments: -BuildId $(Build.BuildNumber) ` + -Organization $(RELEASE_TARGET_ORGANIZATION) ` + -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` + -Project $(RELEASE_TARGET_PROJECT) ` + -ImageName ${{ parameters.image_type }} ` + -AccessToken $(RELEASE_TARGET_TOKEN) + - task: PowerShell@2 displayName: 'Clean up resources' condition: always() diff --git a/images.CI/create-release.ps1 b/images.CI/create-release.ps1 new file mode 100644 index 00000000..72d0db4e --- /dev/null +++ b/images.CI/create-release.ps1 @@ -0,0 +1,31 @@ +param( + [UInt32] [Parameter (Mandatory)] $BuildId, + [String] [Parameter (Mandatory)] $Organization, + [String] [Parameter (Mandatory)] $Project, + [String] [Parameter (Mandatory)] $ImageName, + [String] [Parameter (Mandatory)] $DefinitionId, + [String] [Parameter (Mandatory)] $AccessToken +) + +$Body = @{ + definitionId = $DefinitionId + variables = @{ + ImageBuildId = @{ + value = $BuildId + } + ImageName = @{ + value = $ImageName + } + } + isDraft = "false" +} | ConvertTo-Json -Depth 3 + +$URL = "https://vsrm.dev.azure.com/$Organization/$Project/_apis/release/releases?api-version=5.1" +$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("'':${AccessToken}")) +$headers = @{ + Authorization = "Basic ${base64AuthInfo}" +} + +$NewRelease = Invoke-RestMethod $URL -Body $Body -Method "POST" -Headers $headers -ContentType "application/json" + +Write-Host "Created release: $($NewRelease._links.web.href)" \ No newline at end of file From 50cd92aade7a77fdfeed8893ff825d7921866804 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Thu, 20 Feb 2020 19:10:36 +0300 Subject: [PATCH 021/106] Fix github issue --- images.CI/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index eb0136eb..20adde52 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -14,7 +14,7 @@ jobs: script: | Remove-Item -path './*' -Recurse -Force Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" - git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 + cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" - task: PowerShell@2 displayName: 'Build VM' From aa4c025a44514d590048f867353da1a5dc47b47c Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Thu, 20 Feb 2020 22:23:17 +0300 Subject: [PATCH 022/106] Add comment --- images.CI/azure-pipelines/image-generation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 20adde52..d4fdf0ea 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -14,6 +14,8 @@ jobs: script: | Remove-Item -path './*' -Recurse -Force Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" + # git in powershell sometimes broke the AzDO pipelines with incorrect stdout interpretation + # we redirect the git output to stdout manually to avoid this issue. cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" - task: PowerShell@2 From 883c1e3253b5582f3024f02fa89580dbdb4bf9be Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Fri, 21 Feb 2020 10:30:54 +0300 Subject: [PATCH 023/106] Update comment --- images.CI/azure-pipelines/image-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index d4fdf0ea..51850254 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -14,8 +14,8 @@ jobs: script: | Remove-Item -path './*' -Recurse -Force Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" - # git in powershell sometimes broke the AzDO pipelines with incorrect stdout interpretation - # we redirect the git output to stdout manually to avoid this issue. + # git on self-hosted agent produces some output to stderr even during successful cloning + # use cmd output redirect to overcome it cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" - task: PowerShell@2 From 13db647c4d5d3a3bd824e7ad78229be2f654958b Mon Sep 17 00:00:00 2001 From: Ben Gelens Date: Fri, 21 Feb 2020 08:36:31 +0100 Subject: [PATCH 024/106] add az 3.5.0 to images --- images/linux/Ubuntu1604-README.md | 1 + images/linux/Ubuntu1804-README.md | 1 + images/linux/scripts/installers/1604/azpowershell.sh | 7 +++++++ images/linux/scripts/installers/1804/azpowershell.sh | 9 ++++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index c74c5cfb..b025a8f2 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -257,6 +257,7 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) +- Az Module (3.5.0) - Cached container images - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index b4f03096..7cbcc7a8 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -247,6 +247,7 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) +- Az Module (3.5.0) - Cached container images - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) diff --git a/images/linux/scripts/installers/1604/azpowershell.sh b/images/linux/scripts/installers/1604/azpowershell.sh index 74503d1e..1e87d9b1 100644 --- a/images/linux/scripts/installers/1604/azpowershell.sh +++ b/images/linux/scripts/installers/1604/azpowershell.sh @@ -14,6 +14,7 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -Requi 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_3.1.0 -RequiredVersion 3.1.0 -Force' +sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.5.0 -RequiredVersion 3.5.0 -Force' # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -46,6 +47,11 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath if (!(get-module -listavailable -name Az.accounts)) { Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1 } + $env:PSModulePath = $actualPSModulePath + $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.5.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 exit 1 fi @@ -58,3 +64,4 @@ DocumentInstalledItem "Az Module (2.3.2)" DocumentInstalledItem "Az Module (2.6.0)" DocumentInstalledItem "Az Module (2.8.0)" DocumentInstalledItem "Az Module (3.1.0)" +DocumentInstalledItem "Az Module (3.5.0)" diff --git a/images/linux/scripts/installers/1804/azpowershell.sh b/images/linux/scripts/installers/1804/azpowershell.sh index 73d22945..1e87d9b1 100644 --- a/images/linux/scripts/installers/1804/azpowershell.sh +++ b/images/linux/scripts/installers/1804/azpowershell.sh @@ -14,6 +14,7 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -Requi 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_3.1.0 -RequiredVersion 3.1.0 -Force' +sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.5.0 -RequiredVersion 3.5.0 -Force' # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -46,6 +47,11 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath if (!(get-module -listavailable -name Az.accounts)) { Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1 } + $env:PSModulePath = $actualPSModulePath + $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.5.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 exit 1 fi @@ -57,4 +63,5 @@ DocumentInstalledItem "Az Module (1.6.0)" DocumentInstalledItem "Az Module (2.3.2)" DocumentInstalledItem "Az Module (2.6.0)" DocumentInstalledItem "Az Module (2.8.0)" -DocumentInstalledItem "Az Module (3.1.0)" \ No newline at end of file +DocumentInstalledItem "Az Module (3.1.0)" +DocumentInstalledItem "Az Module (3.5.0)" From 78c3440c50ae517ab754ee4174f8a08940dc7d2a Mon Sep 17 00:00:00 2001 From: Ben Gelens Date: Fri, 21 Feb 2020 08:46:24 +0100 Subject: [PATCH 025/106] reset autogenerated docs --- images/linux/Ubuntu1604-README.md | 1 - images/linux/Ubuntu1804-README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index b025a8f2..c74c5cfb 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -257,7 +257,6 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) -- Az Module (3.5.0) - Cached container images - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 7cbcc7a8..b4f03096 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -247,7 +247,6 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) -- Az Module (3.5.0) - Cached container images - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) From fb51ff3b1df62287c367ee0f1998aa2a24c52abc Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 21 Feb 2020 11:34:07 +0300 Subject: [PATCH 026/106] Change image prefix (#14) * add release step * add creation release * move file to another folder * resolve comments * minor changes * change BuildNumber to BuildId --- images.CI/azure-pipelines/image-generation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 51850254..0e20091f 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -23,7 +23,7 @@ jobs: inputs: targetType: filePath filePath: ./images.CI/build-image.ps1 - arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` + arguments: -ResourcesNamePrefix $(Build.BuildId) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` @@ -42,7 +42,7 @@ jobs: inputs: targetType: filePath filePath: ./images.CI/create-release.ps1 - arguments: -BuildId $(Build.BuildNumber) ` + arguments: -BuildId $(Build.BuildId) ` -Organization $(RELEASE_TARGET_ORGANIZATION) ` -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` -Project $(RELEASE_TARGET_PROJECT) ` @@ -55,7 +55,7 @@ jobs: inputs: targetType: filePath filePath: ./images.CI/cleanup.ps1 - arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` + arguments: -ResourcesNamePrefix $(Build.BuildId) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` From 6da930087b573b580405c5d6021e3747b40a932e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 09:56:16 +0400 Subject: [PATCH 027/106] dotnetcore-sdk.sh has been refactored for using in both Ubuntu 16/18 deployments --- .vscode/tasks.json | 50 +++------- images/linux/scripts/base/repos.sh | 6 +- .../scripts/installers/1804/dotnetcore-sdk.sh | 99 ------------------- .../installers/{1604 => }/dotnetcore-sdk.sh | 4 + images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- 6 files changed, 22 insertions(+), 141 deletions(-) delete mode 100644 images/linux/scripts/installers/1804/dotnetcore-sdk.sh rename images/linux/scripts/installers/{1604 => }/dotnetcore-sdk.sh (96%) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index da6002dd..744b2145 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,42 +1,14 @@ -// Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team -// ${file}: the current opened file -// ${relativeFile}: the current opened file relative to workspaceRoot -// ${fileBasename}: the current opened file's basename -// ${fileDirname}: the current opened file's dirname -// ${fileExtname}: the current opened file's extension -// ${cwd}: the current working directory of the spawned process { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - - // Start PowerShell - "windows": { - "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe", - //"command": "${env:ProgramFiles}/PowerShell/6.0.0/powershell.exe", - "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ] - }, - "linux": { - "command": "/usr/bin/powershell", - "args": [ "-NoProfile" ] - }, - "osx": { - "command": "/usr/local/bin/powershell", - "args": [ "-NoProfile" ] - }, - - // Associate with test task runner - "tasks": [ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ { - "taskName": "Test", - "suppressTaskName": true, - "isTestCommand": true, - "args": [ - "Write-Host 'Invoking Pester...'; $ProgressPreference = 'SilentlyContinue'; Invoke-Pester -Script test -PesterOption @{IncludeVSCodeMarker=$true};", - "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" - ], - "problemMatcher": "$pester" + "type": "bashdb", + "request": "launch", + "name": "Bash-Debug (simplest configuration)", + "program": "${file}" } - ] -} + ] +} \ No newline at end of file diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index f8280cc0..6c56d1ca 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,7 +9,11 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get update +apt-get install apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg +mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg +sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' +apt-get update \ No newline at end of file diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh deleted file mode 100644 index d1fb73ec..00000000 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -################################################################################ -## File: dotnetcore-sdk.sh -## Desc: Installs .NET Core SDK -################################################################################ - -source $HELPER_SCRIPTS/apt.sh -source $HELPER_SCRIPTS/document.sh - -LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") - -LSB_RELEASE=$(lsb_release -rs) - -mksamples() -{ - sdk=$1 - sample=$2 - mkdir "$sdk" - cd "$sdk" || exit - set -e - dotnet help - dotnet new globaljson --sdk-version "$sdk" - dotnet new "$sample" - dotnet restore - dotnet build - set +e - cd .. || exit - rm -rf "$sdk" -} - -set -e - -# Disable telemetry -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do - echo "Determing if .NET Core ($latest_package) is installed" - if ! IsInstalled $latest_package; then - echo "Could not find .NET Core ($latest_package), installing..." - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - apt-get install apt-transport-https - apt-get update - apt-get install $latest_package -y - else - echo ".NET Core ($latest_package) is already installed" - fi -done - -# Get list of all released SDKs from channels which are not end-of-life or preview -release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") -sdks=() -for release_url in ${release_urls[@]}; do - echo "${release_url}" - releases=$(curl "${release_url}") - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) -done - -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) - -for sdk in $sortedSdks; do - url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" - echo "$url" >> urls - echo "Adding $url to list to download later" -done - -# Download additional SDKs -echo "Downloading release tarballs..." -cat urls | xargs -n 1 -P 16 wget -q -for tarball in *.tar.gz; do - dest="./tmp-$(basename -s .tar.gz $tarball)" - echo "Extracting $tarball to $dest" - mkdir "$dest" && tar -C "$dest" -xzf "$tarball" - rsync -qav "$dest/shared/" /usr/share/dotnet/shared/ - rsync -qav "$dest/host/" /usr/share/dotnet/host/ - rsync -qav "$dest/sdk/" /usr/share/dotnet/sdk/ - rm -rf "$dest" - rm "$tarball" -done -rm urls - -DocumentInstalledItem ".NET Core SDK:" -# Smoke test each SDK -for sdk in $sortedSdks; do - mksamples "$sdk" "console" - mksamples "$sdk" "mstest" - mksamples "$sdk" "xunit" - mksamples "$sdk" "web" - mksamples "$sdk" "mvc" - mksamples "$sdk" "webapi" - DocumentInstalledItemIndent "$sdk" -done - -# NuGetFallbackFolder at /usr/share/dotnet/sdk/NuGetFallbackFolder is warmed up by smoke test -# Additional FTE will just copy to ~/.dotnet/NuGet which provides no benefit on a fungible machine -echo "DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" | tee -a /etc/environment -echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh similarity index 96% rename from images/linux/scripts/installers/1604/dotnetcore-sdk.sh rename to images/linux/scripts/installers/dotnetcore-sdk.sh index 7db72755..1d36ef97 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -4,6 +4,7 @@ ## Desc: Installs .NET Core SDK ################################################################################ +HELPER_SCRIPTS=/repos/virtual-environments/images/linux/scripts/helpers source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh @@ -30,6 +31,9 @@ mksamples() set -e +# Disable telemetry +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index ae2ac159..438cdfde 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -131,7 +131,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 3c7ce327..c9f8cac8 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -134,7 +134,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1804/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", From aa2a120c58e5418f7294864993a25e9cf67fae28 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 10:11:28 +0400 Subject: [PATCH 028/106] Return to tasks.json from master branch --- .vscode/tasks.json | 48 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 744b2145..7827bd0e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,14 +1,42 @@ +// Available variables which can be used inside of strings. +// ${workspaceRoot}: the root folder of the team +// ${file}: the current opened file +// ${relativeFile}: the current opened file relative to workspaceRoot +// ${fileBasename}: the current opened file's basename +// ${fileDirname}: the current opened file's dirname +// ${fileExtname}: the current opened file's extension +// ${cwd}: the current working directory of the spawned process { - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + + // Start PowerShell + "windows": { + "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe", + //"command": "${env:ProgramFiles}/PowerShell/6.0.0/powershell.exe", + "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ] + }, + "linux": { + "command": "/usr/bin/powershell", + "args": [ "-NoProfile" ] + }, + "osx": { + "command": "/usr/local/bin/powershell", + "args": [ "-NoProfile" ] + }, + + // Associate with test task runner + "tasks": [ { - "type": "bashdb", - "request": "launch", - "name": "Bash-Debug (simplest configuration)", - "program": "${file}" + "taskName": "Test", + "suppressTaskName": true, + "isTestCommand": true, + "args": [ + "Write-Host 'Invoking Pester...'; $ProgressPreference = 'SilentlyContinue'; Invoke-Pester -Script test -PesterOption @{IncludeVSCodeMarker=$true};", + "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" + ], + "problemMatcher": "$pester" } - ] + ] } \ No newline at end of file From ce04359372196e2dd7bf7f6b1589723ea69dcdfe Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 10:32:44 +0400 Subject: [PATCH 029/106] dotnetcore-sdk.sh - excess debug string has been removed --- images/linux/scripts/installers/dotnetcore-sdk.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 1d36ef97..88b6cb0a 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -3,8 +3,6 @@ ## File: dotnetcore-sdk.sh ## Desc: Installs .NET Core SDK ################################################################################ - -HELPER_SCRIPTS=/repos/virtual-environments/images/linux/scripts/helpers source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh From 4851448fc341db84db90ac0b05fe08aaed9bb198 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2020 11:15:04 +0400 Subject: [PATCH 030/106] Original tasks.json has been reverted --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7827bd0e..da6002dd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -39,4 +39,4 @@ "problemMatcher": "$pester" } ] -} \ No newline at end of file +} From fc972505b72176e213e3cc3e86b9b2990d1b4523 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Thu, 20 Feb 2020 13:49:38 +0400 Subject: [PATCH 031/106] Setting '-y' has been added to installation of apt-transport-https --- images/linux/scripts/base/repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index 6c56d1ca..abf4586e 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,7 +9,7 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get install apt-transport-https +apt-get install -y apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - From 3755a9ea2480d132a54ade5343a9aa153c851525 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Thu, 20 Feb 2020 18:26:31 +0400 Subject: [PATCH 032/106] Adding the Ubuntu 18 repository has been revoved from repos.sh --- images/linux/scripts/base/repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index abf4586e..847101ae 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -13,7 +13,7 @@ apt-get install -y apt-transport-https # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg -sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' apt-get update \ No newline at end of file From d17b6c99164ac9ba2feca552841fdb8078f873dd Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Fri, 21 Feb 2020 13:46:09 +0400 Subject: [PATCH 033/106] 1804/powershellcore.sh - adding the modification of dotnetdev.list file --- images/linux/scripts/installers/1804/powershellcore.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 0a5f2108..3a7df62e 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -8,11 +8,12 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) +sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' # Install Powershell apt-get install -y powershell -# Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746 +# Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746 sudo apt remove libicu64 # Run tests to determine that the software installed as expected From c90c5e0bafd24733e2fd206a6b711136a12c04fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Andr=C3=A9-Chang?= Date: Sat, 22 Feb 2020 14:52:47 +0000 Subject: [PATCH 034/106] Install clang-format --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 0a7f2252..4d3373c9 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -18,6 +18,7 @@ function InstallClang { apt-get install -y "clang-$version" "lldb-$version" "lld-$version" else ./llvm.sh $version + apt-get install -y "clang-format-$version" fi # Run tests to determine that the software installed as expected From b2a3a7f4cc592e766fa7318d1f6f2c6a4be2db1b Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Sun, 23 Feb 2020 12:07:38 +0400 Subject: [PATCH 035/106] Debugging the Ubuntu18 image buld --- images/linux/scripts/installers/1804/powershellcore.sh | 3 +++ images/linux/ubuntu1804.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 3a7df62e..9d031949 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -8,12 +8,15 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) +echo "Addin the repository [microsoft-ubuntu-bionic-prod] to /etc/apt/sources.list.d/dotnetdev.list" sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' # Install Powershell +echo "Running the PowerShell core installation" apt-get install -y powershell # Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746 +echo "Remove the libicu64" sudo apt remove libicu64 # Run tests to determine that the software installed as expected diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index c9f8cac8..8d2a7f49 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -121,6 +121,8 @@ { "type": "shell", "scripts": [ + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", @@ -134,7 +136,6 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -160,7 +161,6 @@ "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From 273c361a641181a205c45d397dcaded827ff0763 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Sun, 23 Feb 2020 12:57:38 +0400 Subject: [PATCH 036/106] Debug Ubuntu1804 build --- images/linux/ubuntu1804.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 8d2a7f49..3e605b32 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -121,14 +121,14 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", "{{template_dir}}/scripts/installers/1804/basic.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", "{{template_dir}}/scripts/installers/clang.sh", From e586b4ecc2a03cb90762e6085c87790df9da0430 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Sun, 23 Feb 2020 19:13:39 +0400 Subject: [PATCH 037/106] Debub the Unbuntu builds --- images/linux/scripts/base/repos.sh | 2 +- images/linux/scripts/installers/1604/powershellcore.sh | 1 + images/linux/scripts/installers/docker-moby.sh | 4 ---- images/linux/scripts/installers/docker.sh | 2 -- images/linux/ubuntu1804.json | 4 ++-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index 847101ae..4ecd2028 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,7 +9,7 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get install -y apt-transport-https +apt-get install -y apt-transport-https ca-certificates curl software-properties-common # Install Microsoft GPG public key curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh index 8ace4742..726faa0b 100644 --- a/images/linux/scripts/installers/1604/powershellcore.sh +++ b/images/linux/scripts/installers/1604/powershellcore.sh @@ -8,6 +8,7 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) +curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list # Install Powershell apt-get install -y powershell diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 625c93cf..f84e495f 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -15,10 +15,6 @@ if ! IsInstalled $docker_package; then echo "Docker ($docker_package) was not found. Installing..." apt-get remove -y moby-engine moby-cli apt-get update - apt-get install -y apt-transport-https ca-certificates curl software-properties-common - curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - - curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list - apt-get update apt-get install -y moby-engine moby-cli else echo "Docker ($docker_package) is already installed" diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index b7fb84e6..e96e5ab1 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -12,8 +12,6 @@ DOCKER_PACKAGE=moby apt-get remove -y moby-engine mobi-cli apt-get update -apt-get install -y apt-transport-https ca-certificates curl software-properties-common -apt-get update apt-get install -y moby-engine mobi-cli docker pull node:10 diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 3e605b32..c9f8cac8 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -127,8 +127,6 @@ "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", "{{template_dir}}/scripts/installers/1804/basic.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", "{{template_dir}}/scripts/installers/clang.sh", @@ -136,6 +134,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -161,6 +160,7 @@ "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", + "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From cdac96cfe3d2a504008b89e7b8c450dcdaa6f3d3 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (Akvelon INC)" Date: Tue, 25 Feb 2020 10:25:57 +0400 Subject: [PATCH 038/106] powershellcore.sh - Excess 'echo's have been removed --- images/linux/scripts/installers/1804/powershellcore.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 9d031949..3a7df62e 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -8,15 +8,12 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) -echo "Addin the repository [microsoft-ubuntu-bionic-prod] to /etc/apt/sources.list.d/dotnetdev.list" sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' # Install Powershell -echo "Running the PowerShell core installation" apt-get install -y powershell # Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746 -echo "Remove the libicu64" sudo apt remove libicu64 # Run tests to determine that the software installed as expected From 454198d92c03bbec95bf354cb2ded54ff25e9abb Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 25 Feb 2020 13:50:31 +0300 Subject: [PATCH 039/106] add one more workaround --- images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 7 ++++++- images/linux/scripts/installers/1804/dotnetcore-sdk.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index 0193708e..46f881c5 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -34,7 +34,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then echo "Could not find .NET Core ($latest_package), installing..." - apt-get install $latest_package -y + #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 + if [ $latest_package != "dotnet-sdk-3.1" ]; then + apt-get install $latest_package -y + else + apt-get install dotnet-sdk-3.1=3.1.101-1 -y + fi else echo ".NET Core ($latest_package) is already installed" fi diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh index 27a922ee..474ad501 100644 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh @@ -42,7 +42,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' apt-get install apt-transport-https apt-get update - apt-get install $latest_package -y + #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 + if [ $latest_package != "dotnet-sdk-3.1" ]; then + apt-get install $latest_package -y + else + apt-get install dotnet-sdk-3.1=3.1.101-1 -y + fi else echo ".NET Core ($latest_package) is already installed" fi From e9bcc3e9f595d033132b9fe4cfc12ffa5faab5e9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 25 Feb 2020 14:37:54 +0300 Subject: [PATCH 040/106] remove 3.1.102 from sorted sdk list --- .../linux/scripts/installers/1604/dotnetcore-sdk.sh | 12 +++++------- .../linux/scripts/installers/1804/dotnetcore-sdk.sh | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index 46f881c5..c0d48dfd 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -55,15 +55,13 @@ for release_url in ${release_urls[@]}; do sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) done -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) +#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 +sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) for sdk in $sortedSdks; do - #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 - if [ $sdk != "3.1.102" ]; then - url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" - echo "$url" >> urls - echo "Adding $url to list to download later" - fi + url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" + echo "$url" >> urls + echo "Adding $url to list to download later" done # Download additional SDKs diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh index 474ad501..b2081510 100644 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh @@ -63,15 +63,13 @@ for release_url in ${release_urls[@]}; do sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) done -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) +#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 +sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) for sdk in $sortedSdks; do - #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133 - if [ $sdk != "3.1.102" ]; then - url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" - echo "$url" >> urls - echo "Adding $url to list to download later" - fi + url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz" + echo "$url" >> urls + echo "Adding $url to list to download later" done # Download additional SDKs From 5ce1c140d195a2cb93737caab597078fbc0936dd Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 25 Feb 2020 17:09:24 +0300 Subject: [PATCH 041/106] add another condition to get current releases --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 5d154550..99688788 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -66,7 +66,8 @@ function InstallAllValidSdks() Invoke-WebRequest -Uri $dotnetChannel.'releases.json' -UseBasicParsing -OutFile "releases-$channelVersion.json" $currentReleases = Get-Content -Path "releases-$channelVersion.json" | ConvertFrom-Json # filtering out the preview/rc releases - $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } | Sort-Object { [Version] $_.'release-version' } + # Remove version 3.1.102 from install list, .NET gave a heads-up that this might cause issues and they are working on a fix. https://github.com/dotnet/aspnetcore/issues/19133 + $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') -and !$_.'release-version'.Contains('3.1.2') } | Sort-Object { [Version] $_.'release-version' } ForEach ($release in $currentReleases) { if ($release.'sdks'.Count -gt 0) @@ -78,8 +79,7 @@ function InstallAllValidSdks() # Sort the sdks on version $sdks = @($release.'sdk'); - # Remove version 3.1.102 from install list, .NET gave a heads-up that this might cause issues and they are working on a fix. - $sdks += $release.'sdks' | Where-Object { !$_.'version'.Equals('3.1.102') -and !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') } + $sdks += $release.'sdks' | Where-Object { !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') } $sdks = $sdks | Sort-Object { [Version] $_.'version' } ForEach ($sdk in $sdks) From 9cc623aaa951d7d141f399d84a54f0d87b0a8ca7 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 25 Feb 2020 19:07:45 +0300 Subject: [PATCH 042/106] Add explanation why we use Azure DevOps CI --- images.CI/azure-pipelines/image-generation.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 0e20091f..7eeb555f 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -1,3 +1,9 @@ +# Currently, we use Azure DevOps for Images.CI as a temporary solution until GitHub Actions supports our requirements +# Since we have to use self-hosted machines to run image builds, we need the following features to use GitHub Actions for Images CI: +# - https://github.community/t5/GitHub-Actions/Make-secrets-available-to-builds-of-forks/m-p/30678#M508 +# - https://github.community/t5/GitHub-Actions/GitHub-Actions-Manual-Trigger-Approvals/td-p/31504 +# - https://github.community/t5/GitHub-Actions/Protecting-github-workflows/td-p/30290 + jobs: - job: pool: ci-agent-pool @@ -8,7 +14,7 @@ jobs: steps: - task: PowerShell@2 displayName: 'Download custom repository' - condition: and(ne(variables['CUSTOM_REPOSITORY_BRANCH'], ''), ne(variables['CUSTOM_REPOSITORY_URL'], '')) + condition: and(ne(variables['CUSTOM_REPOSITORY_URL'], ''), ne(variables['CUSTOM_REPOSITORY_BRANCH'], '')) inputs: targetType: 'inline' script: | From 98d05de2e819dbe7c1d20e7a2f8e1907cf744946 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 25 Feb 2020 19:20:15 +0300 Subject: [PATCH 043/106] add Az 3.5.0 --- .../Installers/Install-AzureModules.ps1 | 231 ++++-------------- .../Installers/Validate-AzureModules.ps1 | 130 ++++++---- 2 files changed, 132 insertions(+), 229 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index 0721e6e9..c8a20c41 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -3,195 +3,66 @@ ## Desc: Install Azure PowerShell modules ################################################################################ -Add-Type -AssemblyName System.IO.Compression.FileSystem - -function Download-Zip -{ - [CmdletBinding()] - Param( - [Parameter( - Mandatory = $true - )] - [string] - $BlobUri - ) - - Write-Host "Downloading the zip from blob: '$BlobUri'" - $fileName = "azureps_" + "$(Get-Random)" + ".zip" - $targetLocation = Join-Path $ENV:Temp -ChildPath $fileName - Write-Host "Download target location: '$targetLocation'" - $webClient = New-Object Net.WebClient - $null = $webClient.DownloadFileAsync($BlobUri, $targetLocation) - while ($webClient.IsBusy) { } - Write-Host "Download complete. Target Location: '$targetLocation'" - return $targetLocation -} - -function Extract-Zip -{ - [CmdletBinding()] - Param( - [Parameter( - Mandatory = $true - )] - [string] - $ZipFilePath, - - [Parameter( - Mandatory = $true - )] - [string] - $TargetLocation - ) - - Write-Host "Expanding the Zip File: '$ZipFilePath'. Target: '$TargetLocation'" - $null = [System.IO.Compression.ZipFile]::ExtractToDirectory($ZipFilePath, $TargetLocation) - Write-Host "Extraction completed successfully." -} - Set-PSRepository -InstallationPolicy Trusted -Name PSGallery -# We try to detect the whether Azure PowerShell is installed using .msi file. If it is installed, we find it's version, then it needs to be uninstalled manually (because the uninstallation requires the PowerShell session to be closed) -$regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" -$installedApplications = Get-ItemProperty -Path $regKey -$SdkVersion = ($installedApplications | Where-Object { $_.DisplayName -and $_.DisplayName.toLower().Contains("microsoft azure powershell") } | Select-Object -First 1).DisplayVersion - -if($SdkVersion -eq $null) -{ - Write-Host "No .msi Installation Present" -} -else -{ - Write-Host "An Azure PowerShell Installation through installer has been detected. Please close this powershell session and manually uninstall the Azure PowerShell from the Add or Remove Programs in the Control Panel. Then, rerun this script from an Admin PowerShell" - throw "An Azure PowerShell Installation through installer has been detected. Please close this powershell session and manually uninstall the Azure PowerShell from the Add or Remove Programs in the Control Panel. Then, rerun this script from an Admin PowerShell" -} - -# We will try to uninstall any installation of Azure PowerShell - -$modules = Get-Module -Name Azure -ListAvailable -Write-Host "The Azure Modules initially present are:" -$modules | Select-Object Name,Version,Path | Format-Table - -foreach($module in $modules) -{ - # add logging for telling what module we are working on now - if(Test-Path -LiteralPath $module.Path) - { - try - { - Uninstall-Module -Name Azure -RequiredVersion $module.Version.tostring() -Force - } - catch - { - Write-Host "The Uninstallation of Azure Module version: $($module.Version.tostring()) failed with the error: $($_.Exception.Message) . Please Check if there isn't any other PowerShell session open." - throw $_.Exception.Message - } - } -} - -$modules = Get-Module -Name AzureRM -ListAvailable -Write-Host "The AzureRM Modules initially present are:" -$modules | Select-Object Name,Version,Path | Format-Table - -foreach($module in $modules) -{ - # add logging for telling what module we are working on now - if(Test-Path -LiteralPath $module.Path) - { - try - { - Uninstall-Module -Name AzureRM -RequiredVersion $module.Version.tostring() -Force - } - catch - { - Write-Host "The Uninstallation of AzureRM Module version: $($module.Version.tostring()) failed with the error: $($_.Exception.Message) . Please Check if there isn't any other PowerShell session open." - throw $_.Exception.Message - } - } -} - -#after this, the only installations available through a Get-Module cmdlet should be nothing - -$modules = Get-Module -Name Azure -ListAvailable - -foreach($module in $modules) -{ - Write-Host "Module found: $($module.Name) Module Version: $($module.Version)" - if($module.Version.ToString() -ne " ") - { - Write-Host "Another installation of Azure module is detected with version $($module.Version.ToString()) at path: $($module.Path)" - throw "Azure module uninstallation unsuccessful" - } -} - -$modules = Get-Module -Name AzureRM -ListAvailable - -foreach($module in $modules) -{ - write-host "Module found: $($module.Name) Module Version: $($module.Version)" - if($module.Version.ToString() -ne " ") - { - Write-Host "Another installation of AzureRM module is detected with version $($module.Version.ToString()) at path: $($module.Path)" - throw "AzureRM module uninstallation unsuccessful" - } -} - #### NOW The correct Modules need to be saved in C:\Modules - -if($(Test-Path -LiteralPath "C:\Modules") -eq $true) +$installPSModulePath = 'C:\Modules' +if(-not (Test-Path -LiteralPath $installPSModulePath)) { - Write-Host "C:\Modules directory is already present. Beginning to clear it up completely" - Remove-Item -Path "C:\Modules" -Recurse -Force + Write-Host "Creating '$installPSModulePath' folder to store PowerShell Azure modules" + $null = New-Item -Path $installPSModulePath -ItemType Directory } -mkdir "C:\Modules" +# Powershell Azure modules to install +$psAzureModulesToInstall = @{ + "azurerm" = @( + "2.1.0" + "3.8.0" + "4.2.1" + "5.1.1" + "6.7.0" + "6.13.1" + ) -$directoryListing = Get-ChildItem -Path "C:\Modules" + "azure" = @( + "2.1.0" + "3.8.0" + "4.2.1" + "5.1.1" + "5.3.0" + ) -if($directoryListing.Length -gt 0) + "az" = @( + "1.0.0" + "1.6.0" + "2.3.2" + "2.6.0" + "3.1.0" + "3.5.0" + ) +} + +# Download Azure PowerShell modules +foreach($psmoduleName in $psAzureModulesToInstall.Keys) { - Write-Host "C:\Modules was not deleted properly. It still has the following contents:" - $directoryListing -} -else { - Write-Host "The Directory is clean. There are no contents present in it" -} - -# Download and unzip the stored AzurePSModules from the vstsagentools public blob -$extractLocation = "C:\Modules" -$azurePsUri = @( - "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/AzPSModules.M163.20191211.17769.zip" -) - -$azureRMModulePath = "C:\Modules\azurerm_2.1.0" -$azureModulePath = "C:\Modules\azure_2.1.0" -$finalPath = "" -$environmentPSModulePath = [Environment]::GetEnvironmentVariable("PSModulePath", "Machine") -$existingPaths = $environmentPSModulePath -split ';' -replace '\\$','' - -if ($existingPaths -notcontains $azureRMModulePath) { - $finalPath = $azureRMModulePath -} - -if ($existingPaths -notcontains $azureModulePath) { - if($finalPath -ne "") { - $finalPath = $finalPath + ";" + $azureModulePath - } - else { - $finalPath = $azureModulePath + Write-Host "Installing '$psmoduleName' to the '$installPSModulePath' path:" + $psmoduleVersions = $psAzureModulesToInstall[$psmoduleName] + foreach($psmoduleVersion in $psmoduleVersions) + { + $psmodulePath = Join-Path $installPSModulePath "${psmoduleName}_${psmoduleVersion}" + Write-Host " - $psmoduleVersion [$psmodulePath]" + try + { + Save-Module -Path $psmodulePath -Name $psmoduleName -RequiredVersion $psmoduleVersion -Force -err + } + catch + { + Write-Host "Error: $_" + exit 1 + } } } -if($finalPath -ne "") { - [Environment]::SetEnvironmentVariable("PSModulePath", $finalPath + ";" + $env:PSModulePath, "Machine") -} - -$env:PSModulePath = $env:PSModulePath.TrimStart(';') - -foreach ($uri in $azurePsUri) -{ - $targetFile = Download-Zip -BlobUri $uri - Extract-Zip -ZipFilePath $targetFile -TargetLocation $extractLocation -} +# Add AzureRM and Azure modules to the PSModulePath +$finalModulePath = '{0};{1};{2}' -f "${installPSModulePath}\azurerm_6.13.1", "${installPSModulePath}\azure_5.3.0", $env:PSModulePath +[Environment]::SetEnvironmentVariable("PSModulePath", $finalModulePath, "Machine") \ No newline at end of file diff --git a/images/win/scripts/Installers/Validate-AzureModules.ps1 b/images/win/scripts/Installers/Validate-AzureModules.ps1 index 6927cce6..766ea08c 100644 --- a/images/win/scripts/Installers/Validate-AzureModules.ps1 +++ b/images/win/scripts/Installers/Validate-AzureModules.ps1 @@ -5,67 +5,99 @@ Import-Module -Name ImageHelpers -Force -$DefaultModule = Get-Module -Name AzureRM -ListAvailable | Select-Object -First 1 - -$env:PSModulePath = $env:PSModulePath + ";C:\Modules" - -$azureModules = Get-Module -Name Azure -ListAvailable | Select-Object Name,Version,Path | Format-Table | Out-String - -Write-Host "The Azure Modules finally present are:" -$azureModules - -if( ($azureModules -match "2.1.0") -and ($azureModules -match "3.8.0") -and ($azureModules -match "4.2.1") -and ($azureModules -match "5.1.1")) -{ - Write-Host "Required Azure modules are present" -} -else { - Write-Host "One or more required Azure modules are not present" - throw "One or more required Azure modules are not present." -} - - -$azureRMModules = Get-Module -Name AzureRM -ListAvailable | Select-Object Name,Version,Path | Format-Table | Out-String - -Write-Host "The AzureRM Modules finally present are:" -$azureRMModules - -if( ($azureRMModules -match "2.1.0") -and ($azureRMModules -match "3.8.0") -and ($azureRMModules -match "4.2.1") -and ($azureRMModules -match "5.1.1")) -{ - Write-Host "Required AzureRM modules are present" - -} -else { - Write-Host "One or more required AzureRM modules are not present" - throw "One or more required AzureRM modules are not present." -} - - -$azureModules = Get-Module -Name AzureRM -ListAvailable - - # Adding description of the software to Markdown -$SoftwareName = "Azure/AzureRM Powershell modules" +function Add-ModuleDescription +{ + param($DefaultModule, [String]$ModuleName) -$Description = @" + # Adding description of the software to Markdown + $SoftwareName = "$ModuleName PowerShell module" + + if ($DefaultModule) + { + $Description = @" #### $($DefaultModule.Version) This version is installed and is available via ``Get-Module -ListAvailable`` "@ - -Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description - -foreach( $module in $azureModules) -{ - if($module.Version -ne $DefaultModule.Version) + } + else { + $Description = "" + } - $CurrentModule = @" + Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + if($ModuleName -eq 'Az') + { + $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\*.psd1 | Select @{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} + } + else + { + $azureModules = Get-Module -Name $ModuleName -ListAvailable | Sort-Object Version -Unique + } + foreach($module in $azureModules) + { + if($module.Version -ne $DefaultModule.Version) + { + + $CurrentModule = @" #### $($module.Version) This version is saved but not installed _Location:_ $($module.Path) - "@ - Add-ContentToMarkdown -Content $CurrentModule + Add-ContentToMarkdown -Content $CurrentModule + } } } + +function Validate-AzureModule +{ + param([String]$ModuleName, [String[]]$ModuleVersions) + + if ($ModuleName -eq 'Az') + { + $installedVersions = Get-ChildItem C:\Modules\az_*\Az\* -Name + $prop = @{n="Name";e={"Az"}},@{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} + $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\*.psd1 | Select $prop + } + else + { + $azureModules = Get-Module -Name $ModuleName -ListAvailable + $installedVersions = $azureModules | Foreach-Object {$_.Version.ToString()} + } + + Write-Host "The $ModuleName module finally present are:" + $azureModules | Select-Object Name,Version,Path | Format-Table | Out-String + + foreach($version in $ModuleVersions) + { + if ($installedVersions -notcontains $version) + { + Write-Host "Required '$ModuleName' module '$version' version is not present" + exit 1 + } + } +} + +# Get default modules version +$defaultAzureRMModule = Get-Module -Name AzureRM -ListAvailable +$defaultAzureModule = Get-Module -Name Azure -ListAvailable + +# Add modules to the PSModulePath +$env:PSModulePath = $env:PSModulePath + ";C:\Modules" + +# Validate Azure modules and versions +$azurermVersions = "2.1.0", "3.8.0", "4.2.1", "5.1.1", "6.7.0", "6.13.1" +Validate-AzureModule -ModuleName AzureRM -ModuleVersions $azurermVersions + +$azureVersions = "2.1.0", "3.8.0", "4.2.1", "5.1.1", "5.3.0" +Validate-AzureModule -ModuleName Azure -ModuleVersions $azureVersions + +$azVersions = "1.0.0", "1.6.0", "2.3.2", "2.6.0", "3.1.0", "3.5.0" +Validate-AzureModule -ModuleName Az -ModuleVersions $azVersions + +# Adding description of the software to Markdown +Add-ModuleDescription -DefaultModule $defaultAzureRMModule -ModuleName AzureRM +Add-ModuleDescription -DefaultModule $defaultAzureModule -ModuleName Azure +Add-ModuleDescription -ModuleName Az \ No newline at end of file From f85d7ff2754519d0949bcc991ec47a2e0bfca2cf Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 25 Feb 2020 19:32:18 +0300 Subject: [PATCH 044/106] enable scheduling --- images.CI/azure-pipelines/ubuntu1604.yml | 14 +++++++------- images.CI/azure-pipelines/ubuntu1804.yml | 14 +++++++------- images.CI/azure-pipelines/windows2016.yml | 14 +++++++------- images.CI/azure-pipelines/windows2019.yml | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml index b19e79a1..8f6dcef2 100644 --- a/images.CI/azure-pipelines/ubuntu1604.yml +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -1,10 +1,10 @@ -# schedules: -# - cron: "0 0 * * *" -# displayName: Daily -# branches: -# include: -# - master -# always: true +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - master + always: true trigger: none pr: diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml index db8acfd9..998ba42e 100644 --- a/images.CI/azure-pipelines/ubuntu1804.yml +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -1,10 +1,10 @@ -# schedules: -# - cron: "0 0 * * *" -# displayName: Daily -# branches: -# include: -# - master -# always: true +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - master + always: true trigger: none pr: diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml index eaac2d1b..667b30bd 100644 --- a/images.CI/azure-pipelines/windows2016.yml +++ b/images.CI/azure-pipelines/windows2016.yml @@ -1,10 +1,10 @@ -# schedules: -# - cron: "0 0 * * *" -# displayName: Daily -# branches: -# include: -# - master -# always: true +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - master + always: true trigger: none pr: diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml index ebbf68e7..508fa12b 100644 --- a/images.CI/azure-pipelines/windows2019.yml +++ b/images.CI/azure-pipelines/windows2019.yml @@ -1,10 +1,10 @@ -# schedules: -# - cron: "0 0 * * *" -# displayName: Daily -# branches: -# include: -# - master -# always: true +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - master + always: true trigger: none pr: From 3e296589c0681c819eab9bc395bee844b8c58e0b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 09:03:07 +0300 Subject: [PATCH 045/106] add az 3.5.0 --- images/win/scripts/Installers/Install-AzureModules.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index c8a20c41..85dfd264 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -53,7 +53,7 @@ foreach($psmoduleName in $psAzureModulesToInstall.Keys) Write-Host " - $psmoduleVersion [$psmodulePath]" try { - Save-Module -Path $psmodulePath -Name $psmoduleName -RequiredVersion $psmoduleVersion -Force -err + Save-Module -Path $psmodulePath -Name $psmoduleName -RequiredVersion $psmoduleVersion -Force -ErrorAction Stop } catch { From d6ccf4628bb498bc1dfa4fb8bbc1b8df215396f0 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Feb 2020 06:44:49 +0000 Subject: [PATCH 046/106] Updating readme file for AzP.20200225.ubuntu18.0 version 20200225 --- images/linux/Ubuntu1804-README.md | 57 +++++++++++++++++-------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index b4f03096..d21aac88 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,10 +1,10 @@ # Ubuntu 18.04.4 LTS -The following software is installed on machines with the 20200217.1 update. +The following software is installed on machines with the 20200225.0 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.4) - AzCopy (azcopy 7.3.0-netcore) -- Azure CLI (azure-cli 2.0.81) +- Azure CLI (azure-cli 2.1.0) - Azure CLI (azure-devops 0.17.0) - Basic CLI: - curl @@ -26,12 +26,13 @@ The following software is installed on machines with the 20200217.1 update. - sudo - telnet - time + - tzdata - unzip - upx - wget - zip - - tzdata -- AWS CLI (aws-cli/1.18.0 Python/2.7.17 Linux/5.0.0-1031-azure botocore/1.15.0) + - zstd +- AWS CLI (aws-cli/1.18.6 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.6) - build-essential - Clang 6.0 (6.0.1) - Clang 8 (8.0.1) @@ -43,6 +44,7 @@ The following software is installed on machines with the 20200217.1 update. - .NET Core SDK: - 3.1.101 - 3.1.100 + - 3.0.103 - 3.0.102 - 3.0.101 - 3.0.100 @@ -67,11 +69,13 @@ The following software is installed on machines with the 20200217.1 update. - 2.2.102 - 2.2.101 - 2.2.100 + - 2.1.804 - 2.1.803 - 2.1.802 - 2.1.801 - 2.1.701 - 2.1.700 + - 2.1.609 - 2.1.608 - 2.1.607 - 2.1.606 @@ -79,6 +83,7 @@ The following software is installed on machines with the 20200217.1 update. - 2.1.604 - 2.1.603 - 2.1.602 + - 2.1.512 - 2.1.511 - 2.1.510 - 2.1.509 @@ -104,14 +109,14 @@ The following software is installed on machines with the 20200217.1 update. - GNU C++ 9.2.1 - GNU Fortran 8.3.0 - GNU Fortran 9.2.1 -- Git (2.25.0) +- Git (2.25.1) - Git Large File Storage (LFS) (2.10.0) - Go 1.11 (go version go1.11.12 linux/amd64) - Go 1.12 (go version go1.12.7 linux/amd64) - Go 1.13 (go version go1.13 linux/amd64) -- Google Chrome (Google Chrome 80.0.3987.106 ) +- Google Chrome (Google Chrome 80.0.3987.122 ) - Chromedriver (ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882})); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (280.0.0) +- Google Cloud SDK (282.0.0) - Haskell Cabal (cabal-install version 2.0.0.1 compiled using version 2.0.1.1 of the Cabal library ) - Haskell Cabal (cabal-install version 2.2.0.0 @@ -119,7 +124,7 @@ compiled using version 2.2.0.1 of the Cabal library ) - Haskell Cabal (cabal-install version 2.4.1.0 compiled using version 2.4.1.0 of the Cabal library ) - Haskell Cabal (cabal-install version 3.0.1.0 -compiled using version 3.0.1.0 of the Cabal library ) +compiled using version 3.0.2.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.0.2) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.2.2) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.4.4) @@ -130,15 +135,15 @@ compiled using version 3.0.1.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.1) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2) - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2) -- Heroku (heroku/7.38.1 linux-x64 node-v12.13.0) -- HHVM (HipHop VM 4.44.0 (rel)) +- Heroku (heroku/7.38.2 linux-x64 node-v12.13.0) +- HHVM (HipHop VM 4.46.0 (rel)) - ImageMagick - Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252") - Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242") - Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS) - Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) -- Gradle 6.1.1 +- Gradle 6.2.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.7.0 go1.13.6 linux/amd64) - kubectl (Client Version: v1.17.3) @@ -150,25 +155,25 @@ compiled using version 3.0.1.0 of the Cabal library ) - MySQL (mysql Ver 14.14 Distrib 5.7.29, for Linux (x86_64) using EditLine wrapper) - MySQL Server (user:root password:root) - MS SQL Server Client Tools -- Node.js (v12.16.0) +- Node.js (v12.16.1) - Grunt (grunt-cli v1.2.0) - Gulp (CLI version: 2.2.0 Local version: Unknown) -- n (6.2.0) +- n (6.3.1) - Parcel (1.12.4) -- TypeScript (Version 3.7.5) +- TypeScript (Version 3.8.2) - Webpack (4.41.6) - Webpack CLI (3.3.11) - Yarn (1.21.1) - PhantomJS (2.1.1) -- PHP 7.1 (PHP 7.1.33-9+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:53:29) ( NTS )) -- PHP 7.2 (PHP 7.2.27-6+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:52:29) ( NTS )) -- PHP 7.3 (PHP 7.3.14-6+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:51:32) ( NTS )) -- PHP 7.4 (PHP 7.4.2 (cli) (built: Feb 5 2020 16:50:38) ( NTS )) +- PHP 7.1 (PHP 7.1.33-12+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:22:16) ( NTS )) +- PHP 7.2 (PHP 7.2.28-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:25) ( NTS )) +- PHP 7.3 (PHP 7.3.15-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:33) ( NTS )) +- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:28) ( NTS )) - Composer (Composer version 1.9.3 2020-02-04 12:58:49) - PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.) - Pollinate -- psql (PostgreSQL) 10.10 +- psql (PostgreSQL) 10.12 - Powershell (PowerShell 6.2.4) - ruby (2.5.1p57) - gem (3.1.2) @@ -186,9 +191,9 @@ the - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) - Sphinx Open Source Search Server - Subversion (svn, version 1.9.7 (r1800392)) -- Terraform (Terraform v0.12.20) +- Terraform (Terraform v0.12.21) - Vcpkg 2020.02.04-unknownhash -- Zeit Now CLI (17.0.3) +- Zeit Now CLI (17.0.4) - Google Repository 58 - Google Play services 49 - Google APIs 24 @@ -197,7 +202,7 @@ the - Google APIs 21 - CMake 3.6.4111459 - Android Support Repository 47.0.0 -- Android SDK Platform-Tools 29.0.5 +- Android SDK Platform-Tools 29.0.6 - Android SDK Platform 29 - Android SDK Platform 28 - Android SDK Platform 27 @@ -248,10 +253,10 @@ the - Az Module (2.8.0) - Az Module (3.1.0) - Cached container images - - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) - - node:10-alpine (Digest: sha256:6e6fdca8006b268936d285a4eadd0bac011b33184b4377c6f1cfc86c222fbb8d) - - node:10 (Digest: sha256:e9d17a0920643d70677ba354398a0464e318fe5f488df8c28c0f895cda6ee2a3) + - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c) + - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e) + - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5) + - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c) - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a) - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e) - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351) From 7dcfbe46b8114702c74b354792213280ad6a9d0d Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 26 Feb 2020 10:44:10 +0300 Subject: [PATCH 047/106] Added Bazel for Windows --- .../win/scripts/Installers/Install-Bazel.ps1 | 6 +++++ .../win/scripts/Installers/Validate-Bazel.ps1 | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 images/win/scripts/Installers/Install-Bazel.ps1 create mode 100644 images/win/scripts/Installers/Validate-Bazel.ps1 diff --git a/images/win/scripts/Installers/Install-Bazel.ps1 b/images/win/scripts/Installers/Install-Bazel.ps1 new file mode 100644 index 00000000..1973c06f --- /dev/null +++ b/images/win/scripts/Installers/Install-Bazel.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Bazel.ps1 +## Desc: Install Bazel +################################################################################ + +choco install bazel -y \ No newline at end of file diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 new file mode 100644 index 00000000..71af7df7 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -0,0 +1,23 @@ +################################################################################ +## File: Validate-Bazel.ps1 +## Desc: Validate Bazel +################################################################################ + +if (Get-Command -Name 'bazel') +{ + Write-Host "bazel on path" +} +else +{ + Write-Host 'bazel is not on path' + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "bazel" + +$Description = @" +_Version:_ $(bazel --version)
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From 5bdec625a3f0d1b075e788f3ab806039d6d47b11 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 10:52:48 +0300 Subject: [PATCH 048/106] add az 3.5.0 --- images/win/scripts/Installers/Install-AzureModules.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index 85dfd264..5a67584a 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -64,5 +64,5 @@ foreach($psmoduleName in $psAzureModulesToInstall.Keys) } # Add AzureRM and Azure modules to the PSModulePath -$finalModulePath = '{0};{1};{2}' -f "${installPSModulePath}\azurerm_6.13.1", "${installPSModulePath}\azure_5.3.0", $env:PSModulePath +$finalModulePath = '{0};{1};{2}' -f "${installPSModulePath}\azurerm_2.1.0", "${installPSModulePath}\azure_2.1.0", $env:PSModulePath [Environment]::SetEnvironmentVariable("PSModulePath", $finalModulePath, "Machine") \ No newline at end of file From ce5225acf89575f77ac6d462c7d4bd786d6b0c5f Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 26 Feb 2020 10:53:26 +0300 Subject: [PATCH 049/106] Added Bazel for Linux --- images/linux/scripts/installers/bazel.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 images/linux/scripts/installers/bazel.sh diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh new file mode 100644 index 00000000..71855745 --- /dev/null +++ b/images/linux/scripts/installers/bazel.sh @@ -0,0 +1,23 @@ +#!/bin/bash +################################################################################ +## File: bazel.sh +## Desc: Installs bazel +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh + +# Install bazel +apt-get update -y +apt-get install -y bazel + +# Run tests to determine that the software installed as expected +echo "Testing to make sure that script performed as expected, and basic scenarios work" +if ! command -v bazel; then + echo "Bazel was not installed" + exit 1 +fi + +# Document what was added to the image +echo "Lastly, documenting what we added to the metadata file" +DocumentInstalledItem "Bazel ($(bazel version))" From 9933a3934c44fb49e0a1d16122ecc46ee9d2534a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 11:07:19 +0300 Subject: [PATCH 050/106] add az 3.5.0 --- .../win/scripts/Installers/Validate-AzureModules.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Validate-AzureModules.ps1 b/images/win/scripts/Installers/Validate-AzureModules.ps1 index 766ea08c..58810ba6 100644 --- a/images/win/scripts/Installers/Validate-AzureModules.ps1 +++ b/images/win/scripts/Installers/Validate-AzureModules.ps1 @@ -29,12 +29,14 @@ This version is installed and is available via ``Get-Module -ListAvailable`` Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description if($ModuleName -eq 'Az') { - $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\*.psd1 | Select @{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} + $prop = @{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} + $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\Az.psd1 | Select-Object $prop } else { $azureModules = Get-Module -Name $ModuleName -ListAvailable | Sort-Object Version -Unique } + foreach($module in $azureModules) { if($module.Version -ne $DefaultModule.Version) @@ -57,16 +59,16 @@ function Validate-AzureModule if ($ModuleName -eq 'Az') { - $installedVersions = Get-ChildItem C:\Modules\az_*\Az\* -Name $prop = @{n="Name";e={"Az"}},@{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} - $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\*.psd1 | Select $prop + $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\Az.psd1 | Select-object $prop } else { $azureModules = Get-Module -Name $ModuleName -ListAvailable - $installedVersions = $azureModules | Foreach-Object {$_.Version.ToString()} } + $installedVersions = $azureModules | Foreach-Object {$_.Version.ToString()} + Write-Host "The $ModuleName module finally present are:" $azureModules | Select-Object Name,Version,Path | Format-Table | Out-String From f585d8019ed150441136126d0764163683f3a651 Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 26 Feb 2020 11:08:18 +0300 Subject: [PATCH 051/106] Updated JSON files --- images/linux/ubuntu1604.json | 1 + images/win/Windows2016-Azure.json | 12 ++++++++++++ images/win/Windows2019-Azure.json | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index ae2ac159..d35f3624 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -123,6 +123,7 @@ "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", + "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/1604/basic.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 60d72a9d..fd0ff610 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -564,6 +564,12 @@ "{{ template_dir }}/scripts/Installers/Install-Kind.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" + ] + }, { "type": "windows-restart", "restart_timeout": "30m" @@ -831,6 +837,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Kind.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" + ] + }, { "type": "file", "source": "C:\\InstalledSoftware.md", diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 15ed7cb8..5ded226e 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -533,6 +533,12 @@ "{{ template_dir }}/scripts/Installers/Install-Kind.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" + ] + }, { "type": "windows-restart", "restart_timeout": "10m" @@ -800,6 +806,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Kind.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" + ] + }, { "type": "file", "source": "C:\\InstalledSoftware.md", From a10ed67087d683bd454278b7454bbb3825221b5c Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 26 Feb 2020 11:16:49 +0300 Subject: [PATCH 052/106] Fixed script for linux and updated ubuntu1804.json file --- images/linux/scripts/installers/bazel.sh | 1 - images/linux/ubuntu1804.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index 71855745..a3bc027e 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -8,7 +8,6 @@ source $HELPER_SCRIPTS/document.sh # Install bazel -apt-get update -y apt-get install -y bazel # Run tests to determine that the software installed as expected diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 3c7ce327..a75a92b2 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -126,6 +126,7 @@ "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", + "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/1804/basic.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", From c100b2846dc285534e6827e09cd5b13b989a5ef9 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 26 Feb 2020 11:36:04 +0300 Subject: [PATCH 053/106] resolve comments --- images.CI/azure-pipelines/image-generation.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 7eeb555f..33b29273 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -1,5 +1,5 @@ -# Currently, we use Azure DevOps for Images.CI as a temporary solution until GitHub Actions supports our requirements -# Since we have to use self-hosted machines to run image builds, we need the following features to use GitHub Actions for Images CI: +# Ideally we would use GitHub Actions for this, but since we use self-hosted machines to run image builds +# we need the following features to use GitHub Actions for Images CI: # - https://github.community/t5/GitHub-Actions/Make-secrets-available-to-builds-of-forks/m-p/30678#M508 # - https://github.community/t5/GitHub-Actions/GitHub-Actions-Manual-Trigger-Approvals/td-p/31504 # - https://github.community/t5/GitHub-Actions/Protecting-github-workflows/td-p/30290 @@ -20,9 +20,12 @@ jobs: script: | Remove-Item -path './*' -Recurse -Force Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" + $env:GIT_REDIRECT_STDERR = '2>&1' + git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 + # git # git on self-hosted agent produces some output to stderr even during successful cloning # use cmd output redirect to overcome it - cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" + # cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" - task: PowerShell@2 displayName: 'Build VM' From d92fbab6501ed3ef352620267725a9ac9912521c Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 26 Feb 2020 11:39:53 +0300 Subject: [PATCH 054/106] Update image-generation.yml --- images.CI/azure-pipelines/image-generation.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 33b29273..332f34ad 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -18,14 +18,11 @@ jobs: inputs: targetType: 'inline' script: | + Write-Host "Clean up default repository" Remove-Item -path './*' -Recurse -Force Write-Host "Download $(CUSTOM_REPOSITORY_BRANCH) branch from $(CUSTOM_REPOSITORY_URL)" $env:GIT_REDIRECT_STDERR = '2>&1' git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 - # git - # git on self-hosted agent produces some output to stderr even during successful cloning - # use cmd output redirect to overcome it - # cmd /c "git clone $(CUSTOM_REPOSITORY_URL) . -b $(CUSTOM_REPOSITORY_BRANCH) --single-branch --depth 1 2>&1" - task: PowerShell@2 displayName: 'Build VM' From 6830fc14d513895d1048fe1972765e1937567329 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 12:41:00 +0300 Subject: [PATCH 055/106] add az 3.5.0 --- .../scripts/Installers/Validate-AzureModules.ps1 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/images/win/scripts/Installers/Validate-AzureModules.ps1 b/images/win/scripts/Installers/Validate-AzureModules.ps1 index 58810ba6..5ec111a9 100644 --- a/images/win/scripts/Installers/Validate-AzureModules.ps1 +++ b/images/win/scripts/Installers/Validate-AzureModules.ps1 @@ -15,11 +15,7 @@ function Add-ModuleDescription if ($DefaultModule) { - $Description = @" -#### $($DefaultModule.Version) - -This version is installed and is available via ``Get-Module -ListAvailable`` -"@ + $Description = "#### $($DefaultModule.Version)`n`nThis version is installed and is available via ``Get-Module -ListAvailable``" } else { @@ -42,12 +38,7 @@ This version is installed and is available via ``Get-Module -ListAvailable`` if($module.Version -ne $DefaultModule.Version) { - $CurrentModule = @" -#### $($module.Version) - -This version is saved but not installed -_Location:_ $($module.Path) -"@ + $CurrentModule = "#### $($module.Version)`n`nThis version is saved but not installed`n_Location:_ $($module.Path)" Add-ContentToMarkdown -Content $CurrentModule } } From f1d83a3d0927de59724a81bcd1701759939043ac Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 13:04:47 +0300 Subject: [PATCH 056/106] move azpowershell.sh script --- .../scripts/installers/1804/azpowershell.sh | 67 ------------------- .../installers/{1604 => }/azpowershell.sh | 0 images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- 4 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 images/linux/scripts/installers/1804/azpowershell.sh rename images/linux/scripts/installers/{1604 => }/azpowershell.sh (100%) diff --git a/images/linux/scripts/installers/1804/azpowershell.sh b/images/linux/scripts/installers/1804/azpowershell.sh deleted file mode 100644 index 1e87d9b1..00000000 --- a/images/linux/scripts/installers/1804/azpowershell.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -################################################################################ -## File: azpowershell.sh -## Desc: Installed Azure PowerShell -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh - -# Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.0.0 -RequiredVersion 1.0.0 -Force' -sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -RequiredVersion 1.6.0 -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.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' -sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.5.0 -RequiredVersion 3.5.0 -Force' - -# Run tests to determine that the software installed as expected -echo "Testing to make sure that script performed as expected, and basic scenarios work" -if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_1.0.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 - $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_1.6.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 - $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_2.3.2:" + $env:PSModulePath; - if (!(get-module -listavailable -name Az.accounts)) { - Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1 - } - $env:PSModulePath = $actualPSModulePath - $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_2.6.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 - $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_2.8.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 - $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 - $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.5.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 - exit 1 -fi - -# Document what was added to the image -echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Az Module (1.0.0)" -DocumentInstalledItem "Az Module (1.6.0)" -DocumentInstalledItem "Az Module (2.3.2)" -DocumentInstalledItem "Az Module (2.6.0)" -DocumentInstalledItem "Az Module (2.8.0)" -DocumentInstalledItem "Az Module (3.1.0)" -DocumentInstalledItem "Az Module (3.5.0)" diff --git a/images/linux/scripts/installers/1604/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh similarity index 100% rename from images/linux/scripts/installers/1604/azpowershell.sh rename to images/linux/scripts/installers/azpowershell.sh diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index ae2ac159..c83f40c3 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -186,7 +186,7 @@ "type": "shell", "scripts":[ "{{template_dir}}/scripts/installers/1604/android.sh", - "{{template_dir}}/scripts/installers/1604/azpowershell.sh", + "{{template_dir}}/scripts/installers/azpowershell.sh", "{{template_dir}}/scripts/helpers/containercache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/python.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 3c7ce327..67c833b7 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -188,7 +188,7 @@ "type": "shell", "scripts":[ "{{template_dir}}/scripts/installers/1804/android.sh", - "{{template_dir}}/scripts/installers/1804/azpowershell.sh", + "{{template_dir}}/scripts/installers/azpowershell.sh", "{{template_dir}}/scripts/helpers/containercache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/python.sh", From 247a98a0fb6dbab1e8ae0692696d6f6c0dfc47d0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 14:53:31 +0300 Subject: [PATCH 057/106] macOS sofware updates week 9 --- images/macos/macos-10.15-Readme.md | 87 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 27039207..afb227c4 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -19,16 +19,16 @@ The following software is installed on machines with the 20200217.2 update. - gcc-9 (Homebrew GCC 9.2.0_3) 9.2.0 - GNU Fortran (Homebrew GCC 8.3.0_2) 8.3.0 - GNU Fortran (Homebrew GCC 9.2.0_3) 9.2.0 -- Node.js v12.16.0 +- Node.js v12.16.1 - NVM 0.33.11 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.0 v13.8.0 +- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.9.0 - PowerShell 6.2.4 - Python 2.7.17 - Python 3.7.6 - Ruby 2.7.0p0 -- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.1.100 3.1.101 +- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 - Go 1.13.8 -- PHP 7.4.2 +- PHP 7.4.3 ### Package Management - Rustup 1.21.1 @@ -54,26 +54,26 @@ The following software is installed on machines with the 20200217.2 update. - Git LFS: 2.10.0 - GNU Wget 1.20.3 - Subversion (SVN) 1.13.0 -- GNU parallel 20200122 +- GNU parallel 20200222 - OpenSSL 1.0.2t 10 Sep 2019 - jq 1.6 - gpg (GnuPG) 2.2.19 -- psql (PostgreSQL) 12.1 +- psql (PostgreSQL) 12.2 - aria2 1.35.0 - azcopy 10.3.4 ### Tools -- Fastlane 2.141.0 +- Fastlane 2.142.0 - Cmake 3.16.4 - App Center CLI 2.3.3 -- Azure CLI 2.0.81 +- Azure CLI 2.1.0 ### Browsers -- Google Chrome 80.0.3987.106 +- Google Chrome 80.0.3987.122 - ChromeDriver 80.0.3987.106 -- Microsoft Edge 80.0.361.54 -- MSEdgeDriver 80.0.361.54 -- Mozilla Firefox 73.0 +- Microsoft Edge 80.0.361.57 +- MSEdgeDriver 80.0.361.57 +- Mozilla Firefox 73.0.1 - geckodriver 0.26.0 ### Toolcache @@ -96,7 +96,7 @@ The following software is installed on machines with the 20200217.2 update. ### Xamarin #### Visual Studio for Mac -- 8.4.5.19 +- 8.4.6.36 #### Mono - 6.6.0.155 @@ -124,7 +124,7 @@ The following software is installed on machines with the 20200217.2 update. ### Xcode | Version | Build | Path | | --------------------------------- | --------------------------------- | --------------------------------- | -| 11.4 (beta) | 11N111s | /Applications/Xcode_11.4_beta.app | +| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app | | 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | | 11.3 | 11C29 | /Applications/Xcode_11.3.app | | 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | @@ -171,7 +171,7 @@ The following software is installed on machines with the 20200217.2 update. | iOS 13.0 | 11.0 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | | iOS 13.1 | 11.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | | iOS 13.2 | 11.2
11.2.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | | iOS 13.4 | 11.4 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | | tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | @@ -190,7 +190,7 @@ The following software is installed on machines with the 20200217.2 update. #### Android SDK Platform-Tools | Package Name | Description | | ------------------------------------------- | ------------------------------------------- | -| platform-tools | Android SDK Platform-Tools, Revision 29.0.5 | +| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 | #### Android SDK Platforms | Package Name | Description | @@ -203,32 +203,33 @@ The following software is installed on machines with the 20200217.2 update. | android-29 | Android SDK Platform 29, Revision 4 | #### Android SDK Build-Tools -| Package Name | Description | -| ---------------------------------------- | ---------------------------------------- | -| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | -| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | -| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | -| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | -| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | -| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | -| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | -| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | -| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | -| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | -| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | -| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | -| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | -| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | -| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | -| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | -| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | -| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | -| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | -| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | -| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | -| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | -| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | -| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | +| Package Name | Description | +| -------------------------------------------- | -------------------------------------------- | +| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | +| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | +| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | +| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | +| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | +| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | +| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | +| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | +| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | +| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | +| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | +| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | +| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | +| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | +| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | +| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | +| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | +| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | +| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | +| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | +| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | +| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | +| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | +| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | +| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 | #### Android Utils | Package Name | Version | @@ -236,7 +237,7 @@ The following software is installed on machines with the 20200217.2 update. | cmake | 3.6.4111459 | | lldb | 3.1.4508709 | | ndk-bundle | 18.1.5063045 | -| Android Emulator | 29.3.4 | +| Android Emulator | 30.0.0 | #### Android Google APIs | Package Name | Description | From e0948115c0d0569cb65786d84c9af4aa738a70e5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 26 Feb 2020 14:59:53 +0300 Subject: [PATCH 058/106] macOS sofware updates week 9 --- images/macos/macos-10.15-Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index afb227c4..20a70b63 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,5 +1,5 @@ # macOS Catalina 10.15.3 (19D76) -The following software is installed on machines with the 20200217.2 update. +The following software is installed on machines with the 20200224.1 update. #### Xcode 11.3.1 set by default ## Operating System From 42e357b79dca66ce7c7944b65fbcc7ae9c6bbe43 Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Wed, 26 Feb 2020 18:16:54 +0400 Subject: [PATCH 059/106] Change from "Docker" to "Docker-Moby" for readme --- images/linux/scripts/installers/docker-moby.sh | 2 +- images/linux/scripts/installers/docker.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 625c93cf..cb166a4b 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -40,4 +40,4 @@ fi ## Add version information to the metadata file echo "Documenting Docker version" docker_version=$(docker -v) -DocumentInstalledItem "Docker ($docker_version)" +DocumentInstalledItem "Docker-Moby ($docker_version)" diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index b7fb84e6..643d1786 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -26,9 +26,4 @@ docker pull debian:9 docker pull alpine:3.7 docker pull alpine:3.8 docker pull alpine:3.9 -docker pull alpine:3.10 - -## Add version information to the metadata file -echo "Documenting Docker version" -DOCKER_VERSION=`docker -v` -DocumentInstalledItem "Docker ($DOCKER_VERSION)" +docker pull alpine:3.10 \ No newline at end of file From aca1c5af1c1e99ca7f4164a20720554ec738b558 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Wed, 26 Feb 2020 19:08:12 +0400 Subject: [PATCH 060/106] powershellcore.sh has been modified --- images/linux/scripts/installers/1604/powershellcore.sh | 1 - images/linux/scripts/installers/1804/powershellcore.sh | 3 --- 2 files changed, 4 deletions(-) diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh index 726faa0b..c71ad2c2 100644 --- a/images/linux/scripts/installers/1604/powershellcore.sh +++ b/images/linux/scripts/installers/1604/powershellcore.sh @@ -7,7 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -LSB_RELEASE=$(lsb_release -rs) curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list # Install Powershell diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index c85de5a9..2f192249 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -7,9 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -LSB_RELEASE=$(lsb_release -rs) - -sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' # libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746 # Fix - install additional libicu65 where the issue is fixed echo "install libicu65" From 412c7fc7558df987b9807b776ad999a40aaf875e Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Feb 2020 15:54:22 +0000 Subject: [PATCH 061/106] Updating readme file for AzP.20200225.win16.0 version 20200225 --- images/win/Windows2016-Readme.md | 51 ++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 688cd1de..effe0c22 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2016 -The following software is installed on machines with the 20200217.1 update. +The following software is installed on machines with the 20200225.0 update. Components marked with **\*** have been upgraded since the previous version of the image. @@ -30,9 +30,9 @@ _Version:_ 6.2.4
## Docker images The following container images have been cached: -* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:a1bd1a6dc00f2734b5071b9295f715f36a653e4b2d259c1a4a4d9e8cd6f3ade8) -* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:7e81f462be36ba1362062306426c65547e6d63b2eab0b5583808581081393a79) -* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:42be24b8810c861cc1b3fe75c5e99f75061cb45fdbae1de46d151c18cc8e6a9a) +* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:2053602020c89ff2d6c0d4005372ebc6cebcf866fb5785e562d91389aa467943) +* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:ca895ab76f1d3ab95f022cbca076e06b62daebafe61af34212bb3ed1fe982d78) +* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:10e43e24be6eb5f3e19e705a88adb9794b569028f0e0d715d40f25e53e04c3fc) * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c) * mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268) @@ -73,6 +73,8 @@ In addition the following optional components are installed: * Microsoft.Net.Component.4.7.1.SDK * Microsoft.Net.Component.4.7.1.TargetingPack * Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools +* Microsoft.Net.Component.4.7.2.SDK +* Microsoft.Net.Component.4.7.2.TargetingPack * Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools * Microsoft.Net.Core.Component.SDK.1x * Microsoft.NetCore.1x.ComponentGroup.Web @@ -359,7 +361,7 @@ _Description:_ .NET has been configured to use TLS 1.2 by default ## Azure CLI -_Version:_ 2.0.81 +_Version:_ 2.1.0 _Environment:_ * PATH: contains location of az.cmd @@ -448,11 +450,11 @@ _Environment:_ ## PHP (x64) -#### 7.4.2 +#### 7.4.3 _Environment:_ -* PATH: contains the location of php.exe version 7.4.2 -* PHPROOT: root directory of the PHP 7.4.2 installation +* PATH: contains the location of php.exe version 7.4.3 +* PHPROOT: root directory of the PHP 7.4.3 installation ## Ruby (x64) @@ -482,17 +484,17 @@ _Environment:_ ## Google Chrome _version:_ -80.0.3987.106 +80.0.3987.122 ## Microsoft Edge _version:_ -80.0.361.54 +80.0.361.62 ## Mozilla Firefox _version:_ -72.0.1 +73.0.1 ## Selenium Web Drivers @@ -508,7 +510,7 @@ _Environment:_ #### Gecko Driver _version:_ -0.24.0 + _Environment:_ * GeckoWebDriver: location of geckodriver.exe @@ -532,7 +534,7 @@ _Environment:_ ## Node.js -_Version:_ 12.16.0
+_Version:_ 12.16.1
_Architecture:_ x64
_Environment:_ * PATH: contains location of node.exe
@@ -573,26 +575,27 @@ _Environment:_ ## Maven -_Version:_ 3.6.2
+_Version:_ 3.6.3
_Environment:_ * PATH: contains location of mvn.bat * M2_HOME: Maven installation root ## Gradle -_Version:_ 6.0.1
+_Version:_ 6.2.1
_Environment:_ * PATH: contains location of gradle ## Cmake -_Version:_ 3.16.2
+_Version:_ 3.16.4
_Environment:_ * PATH: contains location of cmake.exe ## SQL Server Data Tier Application Framework (x64) -_Version:_ 15.0.4538.1
+_Version:_ 15.0.4538.1
+* SQL Server Express LocalDB is available at C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe ## .NET Core @@ -604,6 +607,7 @@ _Environment:_ _SDK:_ * 3.1.101 C:\Program Files\dotnet\sdk\3.1.101 * 3.1.100 C:\Program Files\dotnet\sdk\3.1.100 +* 3.0.103 C:\Program Files\dotnet\sdk\3.0.103 * 3.0.102 C:\Program Files\dotnet\sdk\3.0.102 * 3.0.101 C:\Program Files\dotnet\sdk\3.0.101 * 3.0.100 C:\Program Files\dotnet\sdk\3.0.100 @@ -628,11 +632,13 @@ _SDK:_ * 2.2.102 C:\Program Files\dotnet\sdk\2.2.102 * 2.2.101 C:\Program Files\dotnet\sdk\2.2.101 * 2.2.100 C:\Program Files\dotnet\sdk\2.2.100 +* 2.1.804 C:\Program Files\dotnet\sdk\2.1.804 * 2.1.803 C:\Program Files\dotnet\sdk\2.1.803 * 2.1.802 C:\Program Files\dotnet\sdk\2.1.802 * 2.1.801 C:\Program Files\dotnet\sdk\2.1.801 * 2.1.701 C:\Program Files\dotnet\sdk\2.1.701 * 2.1.700 C:\Program Files\dotnet\sdk\2.1.700 +* 2.1.609 C:\Program Files\dotnet\sdk\2.1.609 * 2.1.608 C:\Program Files\dotnet\sdk\2.1.608 * 2.1.607 C:\Program Files\dotnet\sdk\2.1.607 * 2.1.606 C:\Program Files\dotnet\sdk\2.1.606 @@ -640,6 +646,7 @@ _SDK:_ * 2.1.604 C:\Program Files\dotnet\sdk\2.1.604 * 2.1.603 C:\Program Files\dotnet\sdk\2.1.603 * 2.1.602 C:\Program Files\dotnet\sdk\2.1.602 +* 2.1.512 C:\Program Files\dotnet\sdk\2.1.512 * 2.1.511 C:\Program Files\dotnet\sdk\2.1.511 * 2.1.510 C:\Program Files\dotnet\sdk\2.1.510 * 2.1.509 C:\Program Files\dotnet\sdk\2.1.509 @@ -663,6 +670,7 @@ _SDK:_ _Runtime:_ * 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1 * 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0 +* 3.0.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.3 * 3.0.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.2 * 3.0.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.1 * 3.0.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.0 @@ -683,6 +691,7 @@ _Runtime:_ * 2.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.4 * 2.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.3 * 2.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.2 +* 2.1.16 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.16 * 2.1.15 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.15 * 2.1.14 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.14 * 2.1.13 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.13 @@ -717,7 +726,7 @@ _Environment:_ ## TypeScript -_Version:_ Version 3.7.5
+_Version:_ Version 3.8.2
## Miniconda @@ -742,6 +751,10 @@ _Version:_
_Version:_ jq-1.6
+## zstd + +_Version:_ v1.4.0
+ ## Inno Setup _Version:_ 6.0.3
@@ -756,7 +769,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## Cloud Foundry CLI From f769dc7e9f0b03ab0264915ec8b752ce7efe9a17 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Feb 2020 15:54:42 +0000 Subject: [PATCH 062/106] Updating readme file for AzP.20200225.win19.0 version 20200225 --- images/win/Windows2019-Readme.md | 59 +++++++++++++++++++------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b70b415d..334c21e0 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -The following software is installed on machines with the 20200212.1 update. +The following software is installed on machines with the 20200225.0 update. Components marked with **\*** have been upgraded since the previous version of the image. @@ -19,7 +19,7 @@ _Environment:_ ## Docker-compose -_Version:_ 1.25.3
+_Version:_ 1.25.4
_Environment:_ * PATH: contains location of docker-compose.exe @@ -30,10 +30,10 @@ _Version:_ 6.2.4
## Docker images The following container images have been cached: -* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:7437a0cac8abeb7b540ef249e6c9b5da6e3e218579b187e8a5d4528919497eba) -* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:05c753fb084d83f9742727a301f19bcbb2912b9a58f3ca659ba4c9d3e9b9fec2) -* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:fb04ac71d809a06bd695d7647cff47a1c5ceb2e2b11c1ed7dd32283158522e36) -* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:85433707a809232402827a359c80d0aa08226e7833aa2914be2113e694d2b6ae) +* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:746e54a4398bff0ad516d02fdb9eec5cba1a3b5ba0c15a82c051fc3dc753fe85) +* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:708a9492c51140a07a0bd160c508dd6d17f3b061af0a3f53de607d671ee7176a) +* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:39ba615d7a739fcdd9fc95b97882672d5af7d0861dd16b51b238c822765d2b8d) +* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:4201fb07c1ece2ef0bad7b518fd487d030cd49de98b81b3ed8b98e71432df463) * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c) ## Visual Studio 2019 Enterprise @@ -54,6 +54,9 @@ The following workloads and components are installed with Visual Studio 2019: * Microsoft.Component.VC.Runtime.UCRTSDK * Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools * Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools +* Microsoft.Net.Component.4.7.2.SDK +* Microsoft.Net.Component.4.7.2.TargetingPack +* Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools * Microsoft.Net.ComponentGroup.4.7.DeveloperTools * Microsoft.VisualStudio.Component.AspNet45 * Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools @@ -131,7 +134,8 @@ _Path:_ C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools ## Windows Driver Kit -_Version:_ 10.0.18362.0
+_WDK Version:_ 10.1.18362.1
+_WDK Visual Studio Extension Version:_ 10.0.18346.0
## Azure Service Fabric @@ -337,7 +341,7 @@ _Description:_ .NET has been configured to use TLS 1.2 by default ## Azure CLI -_Version:_ 2.0.81 +_Version:_ 2.1.0 _Environment:_ * PATH: contains location of az.cmd @@ -421,11 +425,11 @@ _Environment:_ ## PHP (x64) -#### 7.4.2 +#### 7.4.3 _Environment:_ -* PATH: contains the location of php.exe version 7.4.2 -* PHPROOT: root directory of the PHP 7.4.2 installation +* PATH: contains the location of php.exe version 7.4.3 +* PHPROOT: root directory of the PHP 7.4.3 installation ## Ruby (x64) @@ -455,17 +459,17 @@ _Environment:_ ## Google Chrome _version:_ -80.0.3987.100 +80.0.3987.122 ## Microsoft Edge _version:_ -80.0.361.50 +80.0.361.57 ## Mozilla Firefox _version:_ -72.0.1 +73.0.1 ## Selenium Web Drivers @@ -481,7 +485,7 @@ _Environment:_ #### Gecko Driver _version:_ -0.24.0 + _Environment:_ * GeckoWebDriver: location of geckodriver.exe @@ -489,7 +493,7 @@ _Environment:_ #### IE Driver _version:_ -80.0.3987.16 +80.0.3987.106 _Environment:_ * IEWebDriver: location of IEDriverServer.exe @@ -505,7 +509,7 @@ _Environment:_ ## Node.js -_Version:_ 12.16.0
+_Version:_ 12.16.1
_Architecture:_ x64
_Environment:_ * PATH: contains location of node.exe
@@ -546,26 +550,27 @@ _Environment:_ ## Maven -_Version:_ 3.6.2
+_Version:_ 3.6.3
_Environment:_ * PATH: contains location of mvn.bat * M2_HOME: Maven installation root ## Gradle -_Version:_ 6.0.1
+_Version:_ 6.2.1
_Environment:_ * PATH: contains location of gradle ## Cmake -_Version:_ 3.16.2
+_Version:_ 3.16.4
_Environment:_ * PATH: contains location of cmake.exe ## SQL Server Data Tier Application Framework (x64) -_Version:_ 15.0.4538.1
+_Version:_ 15.0.4538.1
+* SQL Server Express LocalDB is available at C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe ## .NET Core @@ -577,6 +582,7 @@ _Environment:_ _SDK:_ * 3.1.101 C:\Program Files\dotnet\sdk\3.1.101 * 3.1.100 C:\Program Files\dotnet\sdk\3.1.100 +* 3.0.103 C:\Program Files\dotnet\sdk\3.0.103 * 3.0.102 C:\Program Files\dotnet\sdk\3.0.102 * 3.0.101 C:\Program Files\dotnet\sdk\3.0.101 * 3.0.100 C:\Program Files\dotnet\sdk\3.0.100 @@ -601,11 +607,13 @@ _SDK:_ * 2.2.102 C:\Program Files\dotnet\sdk\2.2.102 * 2.2.101 C:\Program Files\dotnet\sdk\2.2.101 * 2.2.100 C:\Program Files\dotnet\sdk\2.2.100 +* 2.1.804 C:\Program Files\dotnet\sdk\2.1.804 * 2.1.803 C:\Program Files\dotnet\sdk\2.1.803 * 2.1.802 C:\Program Files\dotnet\sdk\2.1.802 * 2.1.801 C:\Program Files\dotnet\sdk\2.1.801 * 2.1.701 C:\Program Files\dotnet\sdk\2.1.701 * 2.1.700 C:\Program Files\dotnet\sdk\2.1.700 +* 2.1.609 C:\Program Files\dotnet\sdk\2.1.609 * 2.1.608 C:\Program Files\dotnet\sdk\2.1.608 * 2.1.607 C:\Program Files\dotnet\sdk\2.1.607 * 2.1.606 C:\Program Files\dotnet\sdk\2.1.606 @@ -613,6 +621,7 @@ _SDK:_ * 2.1.604 C:\Program Files\dotnet\sdk\2.1.604 * 2.1.603 C:\Program Files\dotnet\sdk\2.1.603 * 2.1.602 C:\Program Files\dotnet\sdk\2.1.602 +* 2.1.512 C:\Program Files\dotnet\sdk\2.1.512 * 2.1.511 C:\Program Files\dotnet\sdk\2.1.511 * 2.1.510 C:\Program Files\dotnet\sdk\2.1.510 * 2.1.509 C:\Program Files\dotnet\sdk\2.1.509 @@ -634,6 +643,7 @@ _SDK:_ _Runtime:_ * 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1 * 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0 +* 3.0.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.3 * 3.0.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.2 * 3.0.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.1 * 3.0.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.0 @@ -654,6 +664,7 @@ _Runtime:_ * 2.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.4 * 2.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.3 * 2.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.2 +* 2.1.16 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.16 * 2.1.15 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.15 * 2.1.14 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.14 * 2.1.13 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.13 @@ -685,7 +696,7 @@ _Environment:_ ## TypeScript -_Version:_ Version 3.7.5
+_Version:_ Version 3.8.2
## Miniconda @@ -724,7 +735,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## Cloud Foundry CLI @@ -739,7 +750,7 @@ _Environment:_ ## VSWhere -_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved. instanceId: c902162b installDate: 2/12/2020 11:02:21 PM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-02-12T23:02:21.9476668Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId: properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname: properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe
+_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved. instanceId: 3ca3779b installDate: 2/25/2020 4:54:08 PM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-02-25T16:54:08.9471413Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId: properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname: properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe
* PATH: contains location of vswhere.exe ## Kubectl From 699e797368ab93e7468e9ab6f57914e53739d616 Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Wed, 26 Feb 2020 22:18:58 +0400 Subject: [PATCH 063/106] Delete docker.sh Deleted docker.sh, because its do the same thing --- .../linux/scripts/installers/docker-moby.sh | 12 ++++++++ images/linux/scripts/installers/docker.sh | 29 ------------------- 2 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 images/linux/scripts/installers/docker.sh diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index cb166a4b..90eb04c3 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -37,6 +37,18 @@ else set +e fi +docker pull node:10 +docker pull node:12 +docker pull buildpack-deps:stretch +docker pull node:10-alpine +docker pull node:12-alpine +docker pull debian:8 +docker pull debian:9 +docker pull alpine:3.7 +docker pull alpine:3.8 +docker pull alpine:3.9 +docker pull alpine:3.10 + ## Add version information to the metadata file echo "Documenting Docker version" docker_version=$(docker -v) diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh deleted file mode 100644 index 643d1786..00000000 --- a/images/linux/scripts/installers/docker.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -################################################################################ -## File: docker.sh -## Desc: Installs the correct version of docker onto the image, and pulls -## down the default docker image used for building on ubuntu -################################################################################ - -source $HELPER_SCRIPTS/apt.sh -source $HELPER_SCRIPTS/document.sh - -DOCKER_PACKAGE=moby - -apt-get remove -y moby-engine mobi-cli -apt-get update -apt-get install -y apt-transport-https ca-certificates curl software-properties-common -apt-get update -apt-get install -y moby-engine mobi-cli - -docker pull node:10 -docker pull node:12 -docker pull buildpack-deps:stretch -docker pull node:10-alpine -docker pull node:12-alpine -docker pull debian:8 -docker pull debian:9 -docker pull alpine:3.7 -docker pull alpine:3.8 -docker pull alpine:3.9 -docker pull alpine:3.10 \ No newline at end of file From cb6d440538821c1bfa1876bf193e3f2d9d297dcb Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Wed, 26 Feb 2020 22:40:56 +0400 Subject: [PATCH 064/106] 1604\powershell.core has been modified --- images/linux/scripts/installers/1604/powershellcore.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh index c71ad2c2..5c615ae3 100644 --- a/images/linux/scripts/installers/1604/powershellcore.sh +++ b/images/linux/scripts/installers/1604/powershellcore.sh @@ -7,8 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list - # Install Powershell apt-get install -y powershell From fd86f55d9fa325c8b7520757c1a76f9620fa812f Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Thu, 27 Feb 2020 11:23:42 +0300 Subject: [PATCH 065/106] Fixed script --- images/linux/scripts/installers/bazel.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index a3bc027e..fcc8f03d 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -8,6 +8,9 @@ source $HELPER_SCRIPTS/document.sh # Install bazel +curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - +echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list +apt-get update -y apt-get install -y bazel # Run tests to determine that the software installed as expected From c984fef291b677e33dabd5acc4676885a84aae0f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 27 Feb 2020 12:58:03 +0300 Subject: [PATCH 066/106] add az 3.5.0 windows --- .../Installers/Validate-AzureModules.ps1 | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/win/scripts/Installers/Validate-AzureModules.ps1 b/images/win/scripts/Installers/Validate-AzureModules.ps1 index 5ec111a9..a7be9ef1 100644 --- a/images/win/scripts/Installers/Validate-AzureModules.ps1 +++ b/images/win/scripts/Installers/Validate-AzureModules.ps1 @@ -11,35 +11,35 @@ function Add-ModuleDescription param($DefaultModule, [String]$ModuleName) # Adding description of the software to Markdown - $SoftwareName = "$ModuleName PowerShell module" + $softwareName = "$moduleName PowerShell module" - if ($DefaultModule) + if ($defaultModule) { - $Description = "#### $($DefaultModule.Version)`n`nThis version is installed and is available via ``Get-Module -ListAvailable``" + $description = "#### $($defaultModule.Version)`n`nThis version is installed and is available via ``Get-Module -ListAvailable``" } else { $Description = "" } - Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description - if($ModuleName -eq 'Az') + Add-SoftwareDetailsToMarkdown -SoftwareName $softwareName -DescriptionMarkdown $description + if($moduleName -eq 'Az') { $prop = @{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\Az.psd1 | Select-Object $prop } else { - $azureModules = Get-Module -Name $ModuleName -ListAvailable | Sort-Object Version -Unique + $azureModules = Get-Module -Name $moduleName -ListAvailable | Sort-Object Version -Unique } foreach($module in $azureModules) { - if($module.Version -ne $DefaultModule.Version) + if($module.Version -ne $defaultModule.Version) { - $CurrentModule = "#### $($module.Version)`n`nThis version is saved but not installed`n_Location:_ $($module.Path)" - Add-ContentToMarkdown -Content $CurrentModule + $currentModule = "#### $($module.Version)`n`nThis version is saved but not installed`n_Location:_ $($module.Path)" + Add-ContentToMarkdown -Content $currentModule } } } @@ -48,37 +48,30 @@ function Validate-AzureModule { param([String]$ModuleName, [String[]]$ModuleVersions) - if ($ModuleName -eq 'Az') + foreach($moduleVersion in $moduleVersions) { - $prop = @{n="Name";e={"Az"}},@{n="Version";e={[Version]$_.Directory.Name}},@{n="Path";e={$_.FullName}} - $azureModules = Get-ChildItem C:\Modules\az_*\Az\*\Az.psd1 | Select-object $prop - } - else - { - $azureModules = Get-Module -Name $ModuleName -ListAvailable - } + $modulePath = "${installPSModulePath}\${moduleName}_${moduleVersion}" + # Import each module in PowerShell session + $job = Start-Job -ScriptBlock { + param($modulePath, $moduleName) - $installedVersions = $azureModules | Foreach-Object {$_.Version.ToString()} - - Write-Host "The $ModuleName module finally present are:" - $azureModules | Select-Object Name,Version,Path | Format-Table | Out-String - - foreach($version in $ModuleVersions) - { - if ($installedVersions -notcontains $version) + $env:PsModulePath = "$modulePath;$env:PsModulePath" + Import-Module -Name $moduleName + Get-Module -Name $moduleName + } -ArgumentList $modulePath, $moduleName + $isError = $job | Wait-Job | Foreach-Object ChildJobs | Where-Object {$_.Error} + if($isError) { - Write-Host "Required '$ModuleName' module '$version' version is not present" + Write-Host "Required '$moduleName' module '$moduleVersion' version is not present" exit 1 } + $job | Receive-Job | Select-Object Name,Version,Path + Remove-Job $job } } -# Get default modules version -$defaultAzureRMModule = Get-Module -Name AzureRM -ListAvailable -$defaultAzureModule = Get-Module -Name Azure -ListAvailable - -# Add modules to the PSModulePath -$env:PSModulePath = $env:PSModulePath + ";C:\Modules" +# Modules path +$installPSModulePath = 'C:\Modules' # Validate Azure modules and versions $azurermVersions = "2.1.0", "3.8.0", "4.2.1", "5.1.1", "6.7.0", "6.13.1" @@ -90,6 +83,13 @@ Validate-AzureModule -ModuleName Azure -ModuleVersions $azureVersions $azVersions = "1.0.0", "1.6.0", "2.3.2", "2.6.0", "3.1.0", "3.5.0" Validate-AzureModule -ModuleName Az -ModuleVersions $azVersions +# Get default modules version +$defaultAzureRMModule = Get-Module -Name AzureRM -ListAvailable +$defaultAzureModule = Get-Module -Name Azure -ListAvailable + +# Add modules to the PSModulePath +$env:PSModulePath = $env:PSModulePath + ";C:\Modules" + # Adding description of the software to Markdown Add-ModuleDescription -DefaultModule $defaultAzureRMModule -ModuleName AzureRM Add-ModuleDescription -DefaultModule $defaultAzureModule -ModuleName Azure From 990b479e44064c74d76104de19df987aff6294cf Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Thu, 27 Feb 2020 16:55:23 +0400 Subject: [PATCH 067/106] Minor bug fix --- images/linux/scripts/installers/docker-moby.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 312be56f..b9d43b54 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ -## File: docker-ce.sh -## Desc: Installs docker onto the image, but does not pre-pull any images +## File: docker-moby.sh +## Desc: Installs docker onto the image ################################################################################ source $HELPER_SCRIPTS/apt.sh From f0e4d780060478aa6aa178ba7dc7335eb7ec0f1a Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Thu, 27 Feb 2020 19:14:40 +0400 Subject: [PATCH 068/106] Deleted docker.sh from ubuntu jsons --- images/linux/ubuntu1604.json | 1 - images/linux/ubuntu1804.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index e303746b..155814ca 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -130,7 +130,6 @@ "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", - "{{template_dir}}/scripts/installers/docker.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1492d4b5..884e6769 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -133,7 +133,6 @@ "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", - "{{template_dir}}/scripts/installers/docker.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", From 693f0c23be2cb1c46f6a1cbe9eb71f14b32e20d7 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 18 Dec 2019 11:44:32 -0800 Subject: [PATCH 069/106] Update to helm 3 xref: https://helm.sh/docs/intro/install/#from-script Signed-off-by: Tamal Saha --- images/linux/scripts/installers/1604/kubernetes-tools.sh | 2 +- images/linux/scripts/installers/1804/kubernetes-tools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/1604/kubernetes-tools.sh b/images/linux/scripts/installers/1604/kubernetes-tools.sh index 448ecd05..4855dc71 100644 --- a/images/linux/scripts/installers/1604/kubernetes-tools.sh +++ b/images/linux/scripts/installers/1604/kubernetes-tools.sh @@ -17,7 +17,7 @@ apt-get update apt-get install -y kubectl # Install Helm -curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash +curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" diff --git a/images/linux/scripts/installers/1804/kubernetes-tools.sh b/images/linux/scripts/installers/1804/kubernetes-tools.sh index ba6f0aa0..38659028 100644 --- a/images/linux/scripts/installers/1804/kubernetes-tools.sh +++ b/images/linux/scripts/installers/1804/kubernetes-tools.sh @@ -19,7 +19,7 @@ apt-get update apt-get install -y kubectl # Install Helm -curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash +curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From 7a2ead741fcd3f5e893fa88216fc2db78fa060be Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 28 Feb 2020 19:20:51 +0300 Subject: [PATCH 070/106] Revert "Restore Git bash utilities to the PATH" --- images/win/scripts/Installers/Install-Git.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index c926f606..a67d7c99 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -12,7 +12,6 @@ choco install git -y --package-parameters="/GitAndUnixToolsOnPath /WindowsTermin # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) -Add-MachinePathItem "C:\Program Files\Git\usr\bin" Add-MachinePathItem "C:\Program Files\Git\bin" exit 0 From 3145274036ed557302946c720511dfc49abb4b33 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 2 Mar 2020 14:13:53 +0300 Subject: [PATCH 071/106] Update PATH environment variable to add .dotnet and php composer default folder (#477) * Add environment variables for .dotnet and php comopser * update rust.sh comments --- images/linux/scripts/installers/rust.sh | 3 +-- images/linux/scripts/installers/updatepath.sh | 6 ++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 images/linux/scripts/installers/updatepath.sh diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index d690f380..571538a3 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -14,8 +14,7 @@ export CARGO_HOME=/usr/share/rust/.cargo curl https://sh.rustup.rs -sSf | sh -s -- -y -# Add Cargo and Rust binaries to the machine path -echo "PATH=${CARGO_HOME}/bin:$PATH" | tee -a /etc/environment +# Initialize environment variables source $CARGO_HOME/env # Install common tools diff --git a/images/linux/scripts/installers/updatepath.sh b/images/linux/scripts/installers/updatepath.sh new file mode 100644 index 00000000..7d63ceb1 --- /dev/null +++ b/images/linux/scripts/installers/updatepath.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +CARGO_HOME=/usr/share/rust/.cargo +DOTNET_TOOLS_HOME=/home/runner/.dotnet/tools +PHP_COMPOSER_HOME=/home/runner/.config/composer/vendor/bin +echo "PATH=${CARGO_HOME}/bin:${PATH}:${DOTNET_TOOLS_HOME}:${PHP_COMPOSER_HOME}" | tee -a /etc/environment \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 675b8934..9002370a 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -167,6 +167,7 @@ "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/zeit-now.sh", + "{{template_dir}}/scripts/installers/updatepath.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh" ], diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 2d540af5..2d612510 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -170,6 +170,7 @@ "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/zeit-now.sh", + "{{template_dir}}/scripts/installers/updatepath.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh" ], "environment_vars": [ From 52d17cfc5d965382afbe97f62f22b23fe300b240 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 2 Mar 2020 14:44:14 +0300 Subject: [PATCH 072/106] Add julia (#476) * Update packer configs to add julia * fix julia installation on ubuntu --- images/linux/scripts/installers/julia.sh | 11 ++++++----- images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + images/win/Windows2016-Azure.json | 12 ++++++++++++ images/win/Windows2019-Azure.json | 12 ++++++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh index 1ca45032..a576a540 100644 --- a/images/linux/scripts/installers/julia.sh +++ b/images/linux/scripts/installers/julia.sh @@ -23,17 +23,18 @@ function GetLatestJuliaRelease () { function InstallJulia () { # Extract Major and Minor version from full version string - juliaMajorAndMinorVersion="$(sed 's/\.[^.]*$//' <<< $1)" + juliaMajorAndMinorVersion="$(cut -d. -f1,2 <<< $1)" + juliaInstallationPath="/usr/local/julia$1" curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$juliaMajorAndMinorVersion/julia-$1-linux-x86_64.tar.gz" -o "julia-$1-linux-x86_64.tar.gz" - mkdir -p "/usr/local/julia$juliaMajorAndMinorVersion" - tar -C "/usr/local/julia$juliaMajorAndMinorVersion" -xzf "julia-$1-linux-x86_64.tar.gz" --strip-components=1 julia + mkdir -p "$juliaInstallationPath" + tar -C "$juliaInstallationPath" -xzf "julia-$1-linux-x86_64.tar.gz" --strip-components=1 rm "julia-$1-linux-x86_64.tar.gz" # If this version of Julia is to be the default version, # symlink it into the path if [ "$2" = true ]; then - ln -s "/usr/local/julia$juliaMajorAndMinorVersion/bin/julia" /usr/bin/julia + ln -s "$juliaInstallationPath/bin/julia" /usr/bin/julia fi # Run tests to determine that the software installed as expected @@ -49,7 +50,7 @@ function InstallJulia () { fi # Verify output of julia --version - if [ ! "$(/usr/local/julia"$juliaMajorAndMinorVersion"/bin/julia --version)" = "julia version $1" ]; then + if [ ! "$($juliaInstallationPath/bin/julia --version)" = "julia version $1" ]; then echo "Julia was not installed correctly" exit 1 fi diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 9002370a..7cedc0c8 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -160,6 +160,7 @@ "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", + "{{template_dir}}/scripts/installers/julia.sh", "{{template_dir}}/scripts/installers/sbt.sh", "{{template_dir}}/scripts/installers/selenium.sh", "{{template_dir}}/scripts/installers/sphinx.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 2d612510..beec3c29 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -163,6 +163,7 @@ "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", + "{{template_dir}}/scripts/installers/julia.sh", "{{template_dir}}/scripts/installers/sbt.sh", "{{template_dir}}/scripts/installers/selenium.sh", "{{template_dir}}/scripts/installers/sphinx.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index fd0ff610..cef6db8d 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -338,6 +338,12 @@ "{{ template_dir }}/scripts/Installers/Install-Rust.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Julia.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -657,6 +663,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Rust.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Julia.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 5ded226e..f143d07b 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -307,6 +307,12 @@ "{{ template_dir }}/scripts/Installers/Install-Rust.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Julia.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -626,6 +632,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Rust.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Julia.ps1" + ] + }, { "type": "powershell", "scripts":[ From cce8e66567e75b17398c09ce0182a6557a8db259 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Mon, 2 Mar 2020 17:55:37 +0300 Subject: [PATCH 073/106] Add v141 spectre mitigations --- .../win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index 6e631c4b..006eb868 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -112,6 +112,12 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + ` '--add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest ' + ` '--add Microsoft.VisualStudio.Component.VC.v141 ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.MFC.ARM.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.16299 ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.17134 ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + ` From 6d5f39c606622e669343f26cd5f4561e46276490 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Mon, 2 Mar 2020 16:36:10 +0000 Subject: [PATCH 074/106] Updating readme file for AzP.20200225.ubuntu16.0 version 20200225 --- images/linux/Ubuntu1604-README.md | 59 +++++++++++++++++-------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index c74c5cfb..ded40bfd 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,10 +1,10 @@ # Ubuntu 16.04.6 LTS -The following software is installed on machines with the 20200217.1 update. +The following software is installed on machines with the 20200225.0 update. *** - 7-Zip 9.20 - Ansible (ansible 2.9.4) - AzCopy (azcopy 7.3.0-netcore) -- Azure CLI (azure-cli 2.0.81) +- Azure CLI (azure-cli 2.1.0) - Azure CLI (azure-devops 0.17.0) - Basic CLI: - curl @@ -26,12 +26,13 @@ The following software is installed on machines with the 20200217.1 update. - sudo - telnet - time + - tzdata - unzip - upx - wget - zip - - tzdata -- AWS CLI (aws-cli/1.18.0 Python/2.7.12 Linux/4.15.0-1069-azure botocore/1.15.0) + - zstd +- AWS CLI (aws-cli/1.18.6 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.6) - build-essential - Clang 6.0 (6.0.1) - Clang 8 (8.0.1) @@ -43,6 +44,7 @@ The following software is installed on machines with the 20200217.1 update. - .NET Core SDK: - 3.1.101 - 3.1.100 + - 3.0.103 - 3.0.102 - 3.0.101 - 3.0.100 @@ -67,11 +69,13 @@ The following software is installed on machines with the 20200217.1 update. - 2.2.102 - 2.2.101 - 2.2.100 + - 2.1.804 - 2.1.803 - 2.1.802 - 2.1.801 - 2.1.701 - 2.1.700 + - 2.1.609 - 2.1.608 - 2.1.607 - 2.1.606 @@ -79,6 +83,7 @@ The following software is installed on machines with the 20200217.1 update. - 2.1.604 - 2.1.603 - 2.1.602 + - 2.1.512 - 2.1.511 - 2.1.510 - 2.1.509 @@ -104,16 +109,16 @@ The following software is installed on machines with the 20200217.1 update. - GNU C++ 9.2.1 - GNU Fortran 8.3.0 - GNU Fortran 9.2.1 -- Git (2.25.0) +- Git (2.25.1) - Git Large File Storage (LFS) (2.10.0) - Go 1.9 (go version go1.9.7 linux/amd64) - Go 1.10 (go version go1.10.8 linux/amd64) - Go 1.11 (go version go1.11.12 linux/amd64) - Go 1.12 (go version go1.12.7 linux/amd64) - Go 1.13 (go version go1.13 linux/amd64) -- Google Chrome (Google Chrome 80.0.3987.106 ) +- Google Chrome (Google Chrome 80.0.3987.122 ) - Chromedriver (ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882})); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (280.0.0) +- Google Cloud SDK (282.0.0) - Haskell Cabal (cabal-install version 2.0.0.1 compiled using version 2.0.1.1 of the Cabal library ) - Haskell Cabal (cabal-install version 2.2.0.0 @@ -121,7 +126,7 @@ compiled using version 2.2.0.1 of the Cabal library ) - Haskell Cabal (cabal-install version 2.4.1.0 compiled using version 2.4.1.0 of the Cabal library ) - Haskell Cabal (cabal-install version 3.0.1.0 -compiled using version 3.0.1.0 of the Cabal library ) +compiled using version 3.0.2.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.0.2) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.2.2) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.4.4) @@ -132,15 +137,15 @@ compiled using version 3.0.1.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.1) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2) - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2) -- Heroku (heroku/7.38.1 linux-x64 node-v12.13.0) -- HHVM (HipHop VM 4.44.0 (rel)) +- Heroku (heroku/7.38.2 linux-x64 node-v12.13.0) +- HHVM (HipHop VM 4.46.0 (rel)) - ImageMagick - Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252") - Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242") - Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS) - Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018) -- Gradle 6.2 +- Gradle 6.2.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.7.0 go1.13.6 linux/amd64) - kubectl (Client Version: v1.17.3) @@ -152,23 +157,23 @@ compiled using version 3.0.1.0 of the Cabal library ) - MySQL (mysql Ver 14.14 Distrib 5.7.29, for Linux (x86_64) using EditLine wrapper) - MySQL Server (user:root password:root) - MS SQL Server Client Tools -- Node.js (v12.16.0) +- Node.js (v12.16.1) - Grunt (grunt-cli v1.2.0) - Gulp (CLI version: 2.2.0 Local version: Unknown) -- n (6.2.0) +- n (6.3.1) - Parcel (1.12.4) -- TypeScript (Version 3.7.5) +- TypeScript (Version 3.8.2) - Webpack (4.41.6) - Webpack CLI (3.3.11) - Yarn (1.21.1) - PhantomJS (2.1.1) -- PHP 5.6 (PHP 5.6.40-21+ubuntu16.04.1+deb.sury.org+1 (cli) ) -- PHP 7.0 (PHP 7.0.33-20+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:54:09) ( NTS )) -- PHP 7.1 (PHP 7.1.33-9+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:53:10) ( NTS )) -- PHP 7.2 (PHP 7.2.27-6+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:52:09) ( NTS )) -- PHP 7.3 (PHP 7.3.14-6+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 5 2020 16:51:13) ( NTS )) -- PHP 7.4 (PHP 7.4.2 (cli) (built: Feb 5 2020 16:50:21) ( NTS )) +- PHP 5.6 (PHP 5.6.40-24+ubuntu16.04.1+deb.sury.org+1 (cli) ) +- PHP 7.0 (PHP 7.0.33-23+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:20:42) ( NTS )) +- PHP 7.1 (PHP 7.1.33-12+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:21:57) ( NTS )) +- PHP 7.2 (PHP 7.2.28-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:01) ( NTS )) +- PHP 7.3 (PHP 7.3.15-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:10) ( NTS )) +- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:02) ( NTS )) - Composer (Composer version 1.9.3 2020-02-04 12:58:49) - PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.) - Pollinate @@ -190,9 +195,9 @@ the - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) - Sphinx Open Source Search Server - Subversion (svn, version 1.9.3 (r1718519)) -- Terraform (Terraform v0.12.20) +- Terraform (Terraform v0.12.21) - Vcpkg 2020.02.04-unknownhash -- Zeit Now CLI (17.0.3) +- Zeit Now CLI (17.0.4) - Google Repository 58 - Google Play services 49 - Google APIs 24 @@ -203,7 +208,7 @@ the - Android Support Repository 47.0.0 - Android Solver for ConstraintLayout 1.0.2 - Android Solver for ConstraintLayout 1.0.1 -- Android SDK Platform-Tools 29.0.5 +- Android SDK Platform-Tools 29.0.6 - Android SDK Platform 29 - Android SDK Platform 28 - Android SDK Platform 27 @@ -258,10 +263,10 @@ the - Az Module (2.8.0) - Az Module (3.1.0) - Cached container images - - node:12-alpine (Digest: sha256:0d6db03a05b5d8b417204258cfa34f36eac1c00a54946fb31891e89a642eb449) - - node:12 (Digest: sha256:454651174f54836571258a329788574cf6552bddfd1a7113e769bd9fc3776fe6) - - node:10-alpine (Digest: sha256:6e6fdca8006b268936d285a4eadd0bac011b33184b4377c6f1cfc86c222fbb8d) - - node:10 (Digest: sha256:e9d17a0920643d70677ba354398a0464e318fe5f488df8c28c0f895cda6ee2a3) + - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c) + - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e) + - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5) + - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c) - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a) - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e) - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351) From 270b2c92af744e59019dd64e2269a4d13df18bc3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 3 Mar 2020 10:56:56 +0300 Subject: [PATCH 075/106] add Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre --- images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index 006eb868..cbf82877 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -112,6 +112,7 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + ` '--add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest ' + ` '--add Microsoft.VisualStudio.Component.VC.v141 ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre ' + ` From 7223f36f155c0eb9887834b1ce5af9c1fd2ee16b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 3 Mar 2020 23:19:34 +0300 Subject: [PATCH 076/106] change perl installation order --- images/win/Windows2016-Azure.json | 12 ++++++------ images/win/Windows2019-Azure.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cef6db8d..988f05c3 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -304,6 +304,12 @@ "{{ template_dir }}/scripts/Installers/Windows2016/Install-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -522,12 +528,6 @@ "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index f143d07b..1e2450d5 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -273,6 +273,12 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Install-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -491,12 +497,6 @@ "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ From 50e5c3fed07f7e3ac3747e81a8ce429013b1acb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= Date: Wed, 4 Mar 2020 00:31:14 -0500 Subject: [PATCH 077/106] Supported GHC 8.8.3. (#483) --- images/linux/scripts/installers/haskell.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 14429e92..05e430df 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -25,6 +25,7 @@ apt-get install -y \ ghc-8.6.5 \ ghc-8.8.1 \ ghc-8.8.2 \ + ghc-8.8.3 \ cabal-install-2.0 \ cabal-install-2.2 \ cabal-install-2.4 \ @@ -36,7 +37,7 @@ curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/s # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" # Check all ghc versions -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2; do +for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do if ! command -v /opt/ghc/$version/bin/ghc; then echo "ghc $version was not installed" exit 1 @@ -59,7 +60,7 @@ echo "Lastly, documenting what we added to the metadata file" for version in 2.0 2.2 2.4 3.0; do DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))" done -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2; do +for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))" done DocumentInstalledItem "Haskell Stack ($(stack --version))" From 53e3f34f60a0b41fd9c7dab634a14cc71afd0990 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 4 Mar 2020 17:06:38 +0300 Subject: [PATCH 078/106] add v141 ARM + ARM64 spectre --- images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index cbf82877..a9658fd7 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -113,6 +113,8 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + ` '--add Microsoft.VisualStudio.Component.VC.v141 ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre ' + ` From 0c87ef9fff0605c4038b577263f14f225fd5d63f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 4 Mar 2020 17:14:02 +0300 Subject: [PATCH 079/106] move perl validation scripts for consistency --- images/win/Windows2016-Azure.json | 12 ++++++------ images/win/Windows2019-Azure.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 988f05c3..b427acf8 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -619,6 +619,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -801,12 +807,6 @@ "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 1e2450d5..1db1d6a1 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -588,6 +588,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -764,12 +770,6 @@ "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ From c6bf6c3b7bfd405d3ad1b65c821bf3707f2e9a58 Mon Sep 17 00:00:00 2001 From: Niels <12247711+nielsvbrecht@users.noreply.github.com> Date: Wed, 4 Mar 2020 15:42:36 +0100 Subject: [PATCH 080/106] Install packer on build agent - issue #280 (#295) * create packer.sh deployment file Copy from terraform.sh * add packer.sh to provisioner add packer.sh script to provisioner to install packer. * add packer.sh to provisioner Add packer.sh script to provisioner to install packer * remove blank lines removed blank lines as requested in feedback by alepauly. * remove additional blank lines * Add Install-Packer.ps1 This script installs packer on Windows through chocolatey * Create Validate-Packer.ps1 This script validates the installation of Packer from Install-Packer.ps1 and adds the software details to the markdown files. * Add Packer install and validate script Added Packer install script and validate script to provisioners. * Add Packer install script and validation script Add Packer install and validation script to provisioners. --- images/linux/scripts/installers/packer.sh | 25 +++++++++++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + images/win/Windows2016-Azure.json | 12 +++++++++ images/win/Windows2019-Azure.json | 12 +++++++++ .../win/scripts/Installers/Install-Packer.ps1 | 6 +++++ .../scripts/Installers/Validate-Packer.ps1 | 24 ++++++++++++++++++ 7 files changed, 81 insertions(+) create mode 100644 images/linux/scripts/installers/packer.sh create mode 100644 images/win/scripts/Installers/Install-Packer.ps1 create mode 100644 images/win/scripts/Installers/Validate-Packer.ps1 diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh new file mode 100644 index 00000000..cba8dfb7 --- /dev/null +++ b/images/linux/scripts/installers/packer.sh @@ -0,0 +1,25 @@ +#!/bin/bash +################################################################################ +## File: packer.sh +## Desc: Installs packer +################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh +source $HELPER_SCRIPTS/apt.sh + +# Install Packer +PACKER_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r .current_version) +curl -LO "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" +unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d /usr/local/bin +rm -f "packer_${PACKER_VERSION}_linux_amd64.zip" + +# Run tests to determine that the software installed as expected +echo "Testing to make sure that script performed as expected, and basic scenarios work" +if ! command -v packer; then + echo "Packer was not installed or found on PATH" + exit 1 +fi + +# Document what was added to the image +echo "Lastly, documenting what we added to the metadata file" +DocumentInstalledItem "Packer ($(packer --version))" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 7cedc0c8..62700c4b 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -166,6 +166,7 @@ "{{template_dir}}/scripts/installers/sphinx.sh", "{{template_dir}}/scripts/installers/subversion.sh", "{{template_dir}}/scripts/installers/terraform.sh", + "{{template_dir}}/scripts/installers/packer.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/zeit-now.sh", "{{template_dir}}/scripts/installers/updatepath.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index beec3c29..d825cc85 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -169,6 +169,7 @@ "{{template_dir}}/scripts/installers/sphinx.sh", "{{template_dir}}/scripts/installers/subversion.sh", "{{template_dir}}/scripts/installers/terraform.sh", + "{{template_dir}}/scripts/installers/packer.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/zeit-now.sh", "{{template_dir}}/scripts/installers/updatepath.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cef6db8d..f5632891 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -282,6 +282,12 @@ "scripts":[ "{{ template_dir }}/scripts/Installers/Install-7zip.ps1" ] + }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Packer.ps1" + ] }, { "type": "file", @@ -777,6 +783,12 @@ "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index f143d07b..4bf69c25 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -252,6 +252,12 @@ "{{ template_dir }}/scripts/Installers/Install-7zip.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Packer.ps1" + ] + }, { "type": "file", "source": "{{template_dir}}/toolcache-2019.json", @@ -745,6 +751,12 @@ "scripts":[ "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1" ] + }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1" + ] }, { "type": "powershell", diff --git a/images/win/scripts/Installers/Install-Packer.ps1 b/images/win/scripts/Installers/Install-Packer.ps1 new file mode 100644 index 00000000..4374175d --- /dev/null +++ b/images/win/scripts/Installers/Install-Packer.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Packer.ps1 +## Desc: Install Packer +################################################################################ + +choco install packer -y diff --git a/images/win/scripts/Installers/Validate-Packer.ps1 b/images/win/scripts/Installers/Validate-Packer.ps1 new file mode 100644 index 00000000..250c6f69 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Packer.ps1 @@ -0,0 +1,24 @@ +################################################################################ +## File: Validate-Packer.ps1 +## Desc: Validate Packer +################################################################################ + +if (Get-Command -Name 'packer') +{ + Write-Host "Packer is on path" +} +else +{ + Write-Host 'Packer is not on path' + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "Packer" +$PackerVersion = (packer version).Split("") + +$Description = @" +_Version:_ $PackerVersion.Item(1)
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From 15f15ddc7203e17bd309d0a075d3326e642346e6 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 15:48:43 +0000 Subject: [PATCH 081/106] Updating readme file for AzP.20200301.ubuntu18.1 version 20200301 --- images/linux/Ubuntu1804-README.md | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index d21aac88..4b35378c 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,16 @@ # Ubuntu 18.04.4 LTS -The following software is installed on machines with the 20200225.0 update. +The following software is installed on machines with the 20200301.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.4) - AzCopy (azcopy 7.3.0-netcore) - Azure CLI (azure-cli 2.1.0) - Azure CLI (azure-devops 0.17.0) +- Bazel (Build label: 2.1.1 +Build target: bazel-out/k8-opt/bin/src/main/java/com/google/devtools/build/lib/bazel/BazelServer_deploy.jar +Build time: Fri Feb 21 14:56:47 2020 (1582297007) +Build timestamp: 1582297007 +Build timestamp as int: 1582297007) - Basic CLI: - curl - dnsutils @@ -32,15 +37,14 @@ The following software is installed on machines with the 20200225.0 update. - wget - zip - zstd -- AWS CLI (aws-cli/1.18.6 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.6) +- AWS CLI (aws-cli/1.18.11 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.11) - build-essential - Clang 6.0 (6.0.1) - Clang 8 (8.0.1) - Clang 9 (9.0.0) - CMake (cmake version 3.16.2) - Docker Compose (docker-compose version 1.22.0, build f46880fe) -- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) -- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) +- Docker-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) - .NET Core SDK: - 3.1.101 - 3.1.100 @@ -102,7 +106,7 @@ The following software is installed on machines with the 20200225.0 update. - 2.1.301 - 2.1.300 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4) -- Firefox (Mozilla Firefox 73.0) +- Firefox (Mozilla Firefox 73.0.1) - Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable - GNU C++ 7.4.0 - GNU C++ 8.3.0 @@ -148,7 +152,7 @@ compiled using version 3.0.2.0 of the Cabal library ) - Kind (kind v0.7.0 go1.13.6 linux/amd64) - kubectl (Client Version: v1.17.3) - helm (Client: v2.16.3+g1ee0254) -- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM) +- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.5.3)) - Miniconda (conda 4.7.12) - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb 4 21:20:20 UTC 2020)) @@ -161,10 +165,10 @@ compiled using version 3.0.2.0 of the Cabal library ) Local version: Unknown) - n (6.3.1) - Parcel (1.12.4) -- TypeScript (Version 3.8.2) +- TypeScript (Version 3.8.3) - Webpack (4.41.6) - Webpack CLI (3.3.11) -- Yarn (1.21.1) +- Yarn (1.22.0) - PhantomJS (2.1.1) - PHP 7.1 (PHP 7.1.33-12+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:22:16) ( NTS )) - PHP 7.2 (PHP 7.2.28-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:25) ( NTS )) @@ -178,11 +182,11 @@ Local version: Unknown) - ruby (2.5.1p57) - gem (3.1.2) - rustup (1.21.1) -- rust (1.41.0) +- rust (1.41.1) - cargo (1.41.0) - rustfmt (1.4.11-stable) - clippy (0.0.212) -- rustdoc (1.41.0) +- rustdoc (1.41.1) - bindgen (execute the 0.53.1) @@ -252,14 +256,15 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) +- Az Module (3.5.0) - Cached container images + - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131) + - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407) + - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97) + - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20) + - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd) - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c) - - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e) - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5) - - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c) - - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a) - - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e) - - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351) - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14) - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178) - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f) @@ -271,7 +276,7 @@ the - Python 3.5.9 - Python 3.6.10 - Python 3.7.6 - - Python 3.8.1 + - Python 3.8.2 - Ruby: - Ruby 2.4.9 - Ruby 2.5.7 From 35dfbf86785ac2227c6ed260a0d7e028aec0d6d1 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 4 Mar 2020 20:54:00 +0300 Subject: [PATCH 082/106] Update Android SDK Build-Tools to 29.0.3 in Ubuntu and Windows (#495) * Added Android SDK Build-Tools 29.0.3 * Android-SDK build-tools have been added --- images/linux/scripts/installers/1604/android.sh | 2 ++ images/linux/scripts/installers/1804/android.sh | 2 ++ images/win/scripts/Installers/Update-AndroidSDK.ps1 | 1 + 3 files changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh index a2017cc3..95a44edc 100644 --- a/images/linux/scripts/installers/1604/android.sh +++ b/images/linux/scripts/installers/1604/android.sh @@ -39,6 +39,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \ "platforms;android-17" \ "platforms;android-15" \ "platforms;android-10" \ + "build-tools;29.0.3" \ "build-tools;29.0.2" \ "build-tools;29.0.0" \ "build-tools;28.0.3" \ @@ -110,6 +111,7 @@ DocumentInstalledItem "Android SDK Platform 17" DocumentInstalledItem "Android SDK Platform 15" DocumentInstalledItem "Android SDK Platform 10" DocumentInstalledItem "Android SDK Patch Applier v4" +DocumentInstalledItem "Android SDK Build-Tools 29.0.3" DocumentInstalledItem "Android SDK Build-Tools 29.0.2" DocumentInstalledItem "Android SDK Build-Tools 29.0.0" DocumentInstalledItem "Android SDK Build-Tools 28.0.3" diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh index 0c1fcad8..716f8bb1 100644 --- a/images/linux/scripts/installers/1804/android.sh +++ b/images/linux/scripts/installers/1804/android.sh @@ -37,6 +37,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \ "platforms;android-21" \ "platforms;android-19" \ "platforms;android-17" \ + "build-tools;29.0.3" \ "build-tools;29.0.2" \ "build-tools;29.0.0" \ "build-tools;28.0.3" \ @@ -100,6 +101,7 @@ DocumentInstalledItem "Android SDK Platform 21" DocumentInstalledItem "Android SDK Platform 19" DocumentInstalledItem "Android SDK Platform 17" DocumentInstalledItem "Android SDK Patch Applier v4" +DocumentInstalledItem "Android SDK Build-Tools 29.0.3" DocumentInstalledItem "Android SDK Build-Tools 29.0.2" DocumentInstalledItem "Android SDK Build-Tools 29.0.0" DocumentInstalledItem "Android SDK Build-Tools 28.0.3" diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 559f69c1..0487bb4e 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1 @@ -68,6 +68,7 @@ Push-Location -Path $sdk.FullName "platforms;android-22" ` "platforms;android-21" ` "platforms;android-19" ` + "build-tools;29.0.3" ` "build-tools;29.0.2" ` "build-tools;29.0.0" ` "build-tools;28.0.3" ` From 8abaa49b2e06dd5f29096d15bc37da880e0ff78f Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 20:08:27 +0000 Subject: [PATCH 083/106] Updating readme file for AzP.20200301.ubuntu16.1 version 20200301 --- images/linux/Ubuntu1604-README.md | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index ded40bfd..a00a4084 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,11 +1,16 @@ # Ubuntu 16.04.6 LTS -The following software is installed on machines with the 20200225.0 update. +The following software is installed on machines with the 20200301.1 update. *** - 7-Zip 9.20 - Ansible (ansible 2.9.4) - AzCopy (azcopy 7.3.0-netcore) - Azure CLI (azure-cli 2.1.0) - Azure CLI (azure-devops 0.17.0) +- Bazel (Build label: 2.1.1 +Build target: bazel-out/k8-opt/bin/src/main/java/com/google/devtools/build/lib/bazel/BazelServer_deploy.jar +Build time: Fri Feb 21 14:56:47 2020 (1582297007) +Build timestamp: 1582297007 +Build timestamp as int: 1582297007) - Basic CLI: - curl - dnsutils @@ -32,15 +37,14 @@ The following software is installed on machines with the 20200225.0 update. - wget - zip - zstd -- AWS CLI (aws-cli/1.18.6 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.6) +- AWS CLI (aws-cli/1.18.11 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.11) - build-essential - Clang 6.0 (6.0.1) - Clang 8 (8.0.1) - Clang 9 (9.0.1) - CMake (cmake version 3.16.2) - Docker Compose (docker-compose version 1.22.0, build f46880fe) -- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) -- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) +- Docker-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) - .NET Core SDK: - 3.1.101 - 3.1.100 @@ -102,7 +106,7 @@ The following software is installed on machines with the 20200225.0 update. - 2.1.301 - 2.1.300 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4) -- Firefox (Mozilla Firefox 72.0.2) +- Firefox (Mozilla Firefox 73.0.1) - Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable - GNU C++ 7.4.0 - GNU C++ 8.3.0 @@ -150,7 +154,7 @@ compiled using version 3.0.2.0 of the Cabal library ) - Kind (kind v0.7.0 go1.13.6 linux/amd64) - kubectl (Client Version: v1.17.3) - helm (Client: v2.16.3+g1ee0254) -- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM) +- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.4.1)) - Miniconda (conda 4.7.12) - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb 4 21:20:35 UTC 2020)) @@ -163,10 +167,10 @@ compiled using version 3.0.2.0 of the Cabal library ) Local version: Unknown) - n (6.3.1) - Parcel (1.12.4) -- TypeScript (Version 3.8.2) +- TypeScript (Version 3.8.3) - Webpack (4.41.6) - Webpack CLI (3.3.11) -- Yarn (1.21.1) +- Yarn (1.22.0) - PhantomJS (2.1.1) - PHP 5.6 (PHP 5.6.40-24+ubuntu16.04.1+deb.sury.org+1 (cli) ) - PHP 7.0 (PHP 7.0.33-23+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:20:42) ( NTS )) @@ -182,11 +186,11 @@ Local version: Unknown) - ruby (2.3.1p112) - gem (3.1.2) - rustup (1.21.1) -- rust (1.41.0) +- rust (1.41.1) - cargo (1.41.0) - rustfmt (1.4.11-stable) - clippy (0.0.212) -- rustdoc (1.41.0) +- rustdoc (1.41.1) - bindgen (execute the 0.53.1) @@ -262,14 +266,15 @@ the - Az Module (2.6.0) - Az Module (2.8.0) - Az Module (3.1.0) +- Az Module (3.5.0) - Cached container images + - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131) + - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407) + - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97) + - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20) + - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd) - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c) - - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e) - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5) - - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c) - - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a) - - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e) - - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351) - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14) - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178) - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f) @@ -281,7 +286,7 @@ the - Python 3.5.9 - Python 3.6.10 - Python 3.7.6 - - Python 3.8.1 + - Python 3.8.2 - Ruby: - Ruby 2.4.9 - Ruby 2.5.7 From a94c37ae3ed3a0cf19d48a1a00deda8b75d355c5 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 22:39:49 +0000 Subject: [PATCH 084/106] Updating readme file for AzP.20200301.win16.1 version 20200301 --- images/win/Windows2016-Readme.md | 86 ++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index effe0c22..a130be1b 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2016 -The following software is installed on machines with the 20200225.0 update. +The following software is installed on machines with the 20200301.1 update. Components marked with **\*** have been upgraded since the previous version of the image. @@ -328,7 +328,7 @@ _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21 _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19 -## Azure/AzureRM Powershell modules +## AzureRM PowerShell module #### 2.1.0 @@ -336,23 +336,73 @@ This version is installed and is available via `Get-Module -ListAvailable` #### 3.8.0 This version is saved but not installed -_Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1 #### 4.2.1 This version is saved but not installed -_Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1 #### 5.1.1 This version is saved but not installed -_Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1 #### 6.7.0 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 +#### 6.13.1 + +This version is saved but not installed +_Location:_ C:\Modules\azurerm_6.13.1\AzureRM\6.13.1\AzureRM.psd1 + +## Azure PowerShell module + +#### 2.1.0 + +This version is installed and is available via `Get-Module -ListAvailable` +#### 3.8.0 + +This version is saved but not installed +_Location:_ C:\Modules\azure_3.8.0\Azure\3.8.0\Azure.psd1 +#### 4.2.1 + +This version is saved but not installed +_Location:_ C:\Modules\azure_4.2.1\Azure\4.2.1\Azure.psd1 +#### 5.1.1 + +This version is saved but not installed +_Location:_ C:\Modules\azure_5.1.1\Azure\5.1.1\Azure.psd1 +#### 5.3.0 + +This version is saved but not installed +_Location:_ C:\Modules\azure_5.3.0\Azure\5.3.0\Azure.psd1 + +## Az PowerShell module + +#### 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 +#### 3.5.0 + +This version is saved but not installed +_Location:_ C:\Modules\az_3.5.0\Az\3.5.0\Az.psd1 ## TLS12 @@ -371,7 +421,7 @@ _Version:_ azure-devops 0.17.0 ## Python -_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.1 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.1 (x86)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
## PyPy @@ -393,13 +443,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64 ## Git -_Version:_ 2.25.0
+_Version:_ 2.25.1
_Environment:_ * PATH: contains location of git.exe ## Git Large File Storage (LFS) -_Version:_ 2.9.2
+_Version:_ 2.10.0
_Environment:_ * PATH: contains location of git-lfs.exe * GIT_LFS_PATH: location of git-lfs.exe @@ -466,7 +516,7 @@ _Environment:_ ## Rust (64-bit) -#### 1.41.0 +#### 1.41.1 _Location:_ C:\Rust\.cargo\bin _Environment:_ * PATH: contains the location of rustc.exe @@ -726,7 +776,7 @@ _Environment:_ ## TypeScript -_Version:_ Version 3.8.2
+_Version:_ Version 3.8.3
## Miniconda @@ -736,7 +786,7 @@ _Environment:_ ## Azure CosmosDb Emulator -_Version:_ 2.9.1.0
+_Version:_ 2.9.2.0
_Location:_ C:\Program Files\Azure Cosmos DB Emulator\ ## 7zip @@ -769,7 +819,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## Cloud Foundry CLI @@ -793,3 +843,7 @@ _Environment:_ _Version:_ kind v0.7.0 go1.13.6 windows/amd64
_Environment:_ * PATH: contains location of kind.exe + +## bazel + +_Version:_ bazel 2.1.0
From 5a2acbc6f0d775b70570ce19a3453e251c77a390 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 10:30:24 +0300 Subject: [PATCH 085/106] Add Bazelisk support to Linux and Windows (#490) * added bazelisk * moved bazelisk installation to bazel * changed Validate-Bazel.ps1 * removed Install-Bazelisk.ps1 * changed bazel and bazelisk version output * fixed Validate-Bazel.ps1 * removed the extra "$" character --- images/linux/scripts/installers/bazel.sh | 15 +++++++++-- images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- images/win/Windows2016-Azure.json | 24 +++++++++--------- .../win/scripts/Installers/Install-Bazel.ps1 | 6 +++-- .../win/scripts/Installers/Validate-Bazel.ps1 | 25 +++++++++++++++++-- 6 files changed, 54 insertions(+), 20 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index fcc8f03d..d6649fce 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ## File: bazel.sh -## Desc: Installs bazel +## Desc: Installs Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ # Source the helpers for use with the script @@ -13,6 +13,9 @@ echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | apt-get update -y apt-get install -y bazel +# Install bazelisk +npm install -g @bazel/bazelisk + # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" if ! command -v bazel; then @@ -20,6 +23,14 @@ if ! command -v bazel; then exit 1 fi +if ! command -v bazelisk; then + echo "Bazelisk was not installed" + exit 1 +fi + # Document what was added to the image +bazelisk_version = $(bazelisk version | grep "Bazelisk version:" | cut -d ":" -f 2) + echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Bazel ($(bazel version))" +DocumentInstalledItem "Bazel ($(bazel --version))" +DocumentInstalledItem "Bazelisk ($bazelisk_version)" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 62700c4b..5317804d 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -123,7 +123,6 @@ "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/1604/basic.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", @@ -153,6 +152,7 @@ "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/nodejs.sh", + "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index d825cc85..121a1109 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -126,7 +126,6 @@ "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/1804/basic.sh", "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/build-essential.sh", @@ -156,6 +155,7 @@ "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/nodejs.sh", + "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index f5632891..c1db38b6 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -277,6 +277,12 @@ "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -576,12 +582,6 @@ "{{ template_dir }}/scripts/Installers/Install-Kind.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" - ] - }, { "type": "windows-restart", "restart_timeout": "30m" @@ -717,6 +717,12 @@ "{{ template_dir }}/scripts/Installers/Validate-NodeLts.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -861,12 +867,6 @@ "{{ template_dir }}/scripts/Installers/Validate-Kind.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" - ] - }, { "type": "file", "source": "C:\\InstalledSoftware.md", diff --git a/images/win/scripts/Installers/Install-Bazel.ps1 b/images/win/scripts/Installers/Install-Bazel.ps1 index 1973c06f..fb14a856 100644 --- a/images/win/scripts/Installers/Install-Bazel.ps1 +++ b/images/win/scripts/Installers/Install-Bazel.ps1 @@ -1,6 +1,8 @@ ################################################################################ ## File: Install-Bazel.ps1 -## Desc: Install Bazel +## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ -choco install bazel -y \ No newline at end of file +choco install bazel -y + +npm install -g @bazel/bazelisk \ No newline at end of file diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 71af7df7..3fc0e3d6 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -1,6 +1,6 @@ ################################################################################ ## File: Validate-Bazel.ps1 -## Desc: Validate Bazel +## Desc: Validate Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ if (Get-Command -Name 'bazel') @@ -13,11 +13,32 @@ else exit 1 } -# Adding description of the software to Markdown +if (Get-Command -Name 'bazelisk') +{ + Write-Host "bazelisk on path" +} +else +{ + Write-Host 'bazelisk is not on path' + exit 1 +} + +# Adding description of Bazel to Markdown $SoftwareName = "bazel" $Description = @" _Version:_ $(bazel --version)
"@ +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + +# Adding description of Bazelisk to Markdown +$bazelisk_version = (bazelisk version | Select-String "Bazelisk version:").Split(":")[1] + +$SoftwareName = "bazelisk" + +$Description = @" +_Version:_ $bazelisk_version
+"@ + Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From 8d788f5c09b470a7d01c9489eb608f943e3f9ed4 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 10:37:23 +0300 Subject: [PATCH 086/106] fix packer version (#496) --- images/win/scripts/Installers/Validate-Packer.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Validate-Packer.ps1 b/images/win/scripts/Installers/Validate-Packer.ps1 index 250c6f69..85473557 100644 --- a/images/win/scripts/Installers/Validate-Packer.ps1 +++ b/images/win/scripts/Installers/Validate-Packer.ps1 @@ -15,10 +15,10 @@ else # Adding description of the software to Markdown $SoftwareName = "Packer" -$PackerVersion = (packer version).Split("") +$PackerVersion = packer --version $Description = @" -_Version:_ $PackerVersion.Item(1)
+_Version:_ $PackerVersion
"@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From d655e7d8195d6728d03445ef1c0f64ad58aaa66a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 5 Mar 2020 10:57:16 +0300 Subject: [PATCH 087/106] Disable mysql.service --- images/linux/scripts/installers/mysql.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 63474e39..3eda0733 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -44,3 +44,7 @@ echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "MySQL ($(mysql --version))" DocumentInstalledItem "MySQL Server (user:root password:root)" DocumentInstalledItem "MS SQL Server Client Tools" + +# Disable mysql.service +systemctl is-active --quiet service && systemctl stop mysql.service +systemctl disable mysql.service From 5f35cc550b3998281bd34d9887f11f675c35287a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:27:02 +0300 Subject: [PATCH 088/106] Disable mysql.service --- images/linux/scripts/installers/mysql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 3eda0733..98d0d665 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -46,5 +46,5 @@ DocumentInstalledItem "MySQL Server (user:root password:root)" DocumentInstalledItem "MS SQL Server Client Tools" # Disable mysql.service -systemctl is-active --quiet service && systemctl stop mysql.service +systemctl is-active --quiet mysql.service && systemctl stop mysql.service systemctl disable mysql.service From a04b35b9e947fd3ab82fb8e55c976cb2e6f69d35 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 5 Mar 2020 13:02:18 +0300 Subject: [PATCH 089/106] fix vswhere version output --- images/win/scripts/Installers/Validate-VSWhere.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Validate-VSWhere.ps1 b/images/win/scripts/Installers/Validate-VSWhere.ps1 index 7b41519c..c44ba7d4 100644 --- a/images/win/scripts/Installers/Validate-VSWhere.ps1 +++ b/images/win/scripts/Installers/Validate-VSWhere.ps1 @@ -15,7 +15,7 @@ else # Adding description of the software to Markdown $SoftwareName = "VSWhere" -$VswhereVersion = $(vswhere) +$VswhereVersion = (Get-Command -Name vswhere).FileVersionInfo.ProductVersion $Description = @" _Version_: $VswhereVersion
From 17235787ae2c3636fdcc4664368b005a1bd61e19 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 5 Mar 2020 15:14:00 +0300 Subject: [PATCH 090/106] Unite powershell installation scripts --- .../scripts/installers/1604/powershellcore.sh | 26 ------------------- .../installers/{1804 => }/powershellcore.sh | 10 ++++--- images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 images/linux/scripts/installers/1604/powershellcore.sh rename images/linux/scripts/installers/{1804 => }/powershellcore.sh (82%) diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh deleted file mode 100644 index 5c615ae3..00000000 --- a/images/linux/scripts/installers/1604/powershellcore.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -################################################################################ -## File: powershellcore.sh -## Desc: Installs powershellcore -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh - -# Install Powershell -apt-get install -y powershell - -# Run tests to determine that the software installed as expected -echo "Testing to make sure that script performed as expected, and basic scenarios work" -if ! command -v pwsh; then - echo "pwsh was not installed" - exit 1 -fi -if ! pwsh -c 'Write-Host Hello world'; then - echo "pwsh failed to run" - exit 1 -fi - -# Document what was added to the image -echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Powershell ($(pwsh --version))" diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh similarity index 82% rename from images/linux/scripts/installers/1804/powershellcore.sh rename to images/linux/scripts/installers/powershellcore.sh index 2f192249..e41e604c 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -7,10 +7,14 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746 +LSB_RELEASE=$(lsb_release -rs) + +# libicu64, which comes with php-intl module, has powershell breaking issue on Ubuntu 16.04 https://github.com/PowerShell/PowerShell/issues/9746 # Fix - install additional libicu65 where the issue is fixed -echo "install libicu65" -apt get install libicu65 +if [ $LSB_RELEASE == "16.04" ]; then + echo "install libicu65" + apt get install libicu65 +fi # Install Powershell apt-get install -y powershell diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 5317804d..7cd93f76 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -157,7 +157,7 @@ "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/1604/powershellcore.sh", + "{{template_dir}}/scripts/installers/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/julia.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 121a1109..4153b200 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -160,7 +160,7 @@ "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/1804/powershellcore.sh", + "{{template_dir}}/scripts/installers/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/julia.sh", From 86613701db97918bfe6a043660f2a62c03ec157a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 19:05:00 +0300 Subject: [PATCH 091/106] Update SSDT to 15.9.3 (#493) --- images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 index f51f49d3..9362c9bd 100644 --- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 +++ b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 @@ -5,8 +5,8 @@ Import-Module -Name ImageHelpers -Force -#SSDT for Visual Studio 2017 (15.8.2) -$InstallerURI = 'https://download.microsoft.com/download/D/F/8/DF8B51B9-8E9F-47F3-A27B-33EEDADD8966/SSDT-Setup-ENU.exe' +#SSDT for Visual Studio 2017 (15.9.3) +$InstallerURI = 'https://download.microsoft.com/download/5/2/D/52DEF429-5B17-470C-82D9-654116080B15/SSDT-Setup-ENU.exe' $InstallerName = 'SSDT-Setup-ENU.exe' $logFilePath = "$env:TEMP\ssdtlog.txt" $ArgumentList = ('/install', 'INSTALLALL', '/passive', '/norestart', "/log `"$logFilePath`"") From 49887f2d2a2456c4934caf47d07c5e8d1292832e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 5 Mar 2020 19:19:11 +0300 Subject: [PATCH 092/106] remove workaround --- images/linux/scripts/installers/powershellcore.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index e41e604c..5c615ae3 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -7,15 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -LSB_RELEASE=$(lsb_release -rs) - -# libicu64, which comes with php-intl module, has powershell breaking issue on Ubuntu 16.04 https://github.com/PowerShell/PowerShell/issues/9746 -# Fix - install additional libicu65 where the issue is fixed -if [ $LSB_RELEASE == "16.04" ]; then - echo "install libicu65" - apt get install libicu65 -fi - # Install Powershell apt-get install -y powershell From c0cc1e10b4c238ed1628f8b2f4e4a9f0a372e423 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 19:40:10 +0300 Subject: [PATCH 093/106] Software updates week 10 (#492) --- images/macos/macos-10.15-Readme.md | 234 +++++++++++++++-------------- 1 file changed, 118 insertions(+), 116 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 20a70b63..aae45169 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -13,7 +13,7 @@ The following software is installed on machines with the 20200224.1 update. - Java 11: Zulu11.37+17-CA (build 11.0.6+10-LTS) - Java 12: Zulu12.3+11-CA (build 12.0.2+3) - Java 13: Zulu13.29+9-CA (build 13.0.2+6-MTS) -- Rust 1.41.0 +- Rust 1.41.1 - Clang/LLVM 9.0.1 - gcc-8 (Homebrew GCC 8.3.0_2) 8.3.0 - gcc-9 (Homebrew GCC 9.2.0_3) 9.2.0 @@ -25,28 +25,29 @@ The following software is installed on machines with the 20200224.1 update. - PowerShell 6.2.4 - Python 2.7.17 - Python 3.7.6 -- Ruby 2.7.0p0 +- Ruby 2.6.5p114 - .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 -- Go 1.13.8 +- Go 1.14 - PHP 7.4.3 ### Package Management - Rustup 1.21.1 - Bundler version 2.1.4 - Carthage 0.34.0 -- CocoaPods 1.8.4 +- CocoaPods 1.9.0 - Homebrew 2.2.6 - NPM 6.13.4 - Yarn 1.22.0 -- NuGet 5.3.1.6268 +- NuGet 5.4.0.6315 - Pip 19.3.1 (python 2.7) - Pip 19.3.1 (python 3.7) - Miniconda 4.7.12 - RubyGems 3.1.2 +- Vcpkg 2020.02.04 ### Project Management - Apache Maven 3.6.3 -- Gradle 6.2 +- Gradle 6.2.1 ### Utilities - Curl 7.68.0 @@ -61,6 +62,7 @@ The following software is installed on machines with the 20200224.1 update. - psql (PostgreSQL) 12.2 - aria2 1.35.0 - azcopy 10.3.4 +- zstd 1.4.4 ### Tools - Fastlane 2.142.0 @@ -71,8 +73,8 @@ The following software is installed on machines with the 20200224.1 update. ### Browsers - Google Chrome 80.0.3987.122 - ChromeDriver 80.0.3987.106 -- Microsoft Edge 80.0.361.57 -- MSEdgeDriver 80.0.361.57 +- Microsoft Edge 80.0.361.62 +- MSEdgeDriver 80.0.361.62 - Mozilla Firefox 73.0.1 - geckodriver 0.26.0 @@ -88,7 +90,7 @@ The following software is installed on machines with the 20200224.1 update. - 3.5.9 - 3.6.10 - 3.7.6 -- 3.8.1 +- 3.8.2 #### PyPy - 2.7.17 @@ -96,20 +98,20 @@ The following software is installed on machines with the 20200224.1 update. ### Xamarin #### Visual Studio for Mac -- 8.4.6.36 +- 8.4.7.17 #### Mono -- 6.6.0.155 +- 6.6.0.166 - 6.4.0.208 #### Xamarin.iOS -- 13.10.0.17 +- 13.10.0.21 - 13.8.3.0 - 13.6.0.12 - 13.4.0.2 #### Xamarin.Mac -- 6.10.0.17 +- 6.10.0.21 - 6.8.3.0 - 6.6.0.12 - 6.4.0.2 @@ -122,15 +124,15 @@ The following software is installed on machines with the 20200224.1 update. - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| --------------------------------- | --------------------------------- | --------------------------------- | -| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app | -| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | -| 11.3 | 11C29 | /Applications/Xcode_11.3.app | -| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | -| 11.2 | 11B52 | /Applications/Xcode_11.2.app | -| 11.1 | 11A1027 | /Applications/Xcode_11.1.app | -| 11.0 | 11A420a | /Applications/Xcode_11.app | +| Version | Build | Path | +| ---------------- | ------- | --------------------------------- | +| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app | +| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | +| 11.3 | 11C29 | /Applications/Xcode_11.3.app | +| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | +| 11.2 | 11B52 | /Applications/Xcode_11.2.app | +| 11.1 | 11A1027 | /Applications/Xcode_11.1.app | +| 11.0 | 11A420a | /Applications/Xcode_11.app | #### Xcode Support Tools - Nomad CLI 3.1.2 @@ -140,46 +142,46 @@ The following software is installed on machines with the 20200224.1 update. - xcversion 2.6.3 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| -------------------------------------------- | -------------------------------------------- | -------------------------------------------- | -| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 | -| iOS 13.0 | iphoneos13.0 | 11.0 | -| iOS 13.1 | iphoneos13.1 | 11.1 | -| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| iOS 13.4 | iphoneos13.4 | 11.4 | -| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 | -| Simulator - iOS 13.1 | iphonesimulator13.1 | 11.1 | -| Simulator - iOS 13.2 | iphonesimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - iOS 13.4 | iphonesimulator13.4 | 11.4 | -| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 | -| tvOS 13.2 | appletvos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| tvOS 13.4 | appletvos13.4 | 11.4 | -| Simulator - tvOS 13.0 | appletvsimulator13.0 | 11.0, 11.1 | -| Simulator - tvOS 13.2 | appletvsimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.4 | -| watchOS 6.0 | watchos6.0 | 11.0, 11.1 | -| watchOS 6.1 | watchos6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | -| watchOS 6.2 | watchos6.2 | 11.4 | -| Simulator - watchOS 6.0 | watchsimulator6.0 | 11.0, 11.1 | -| Simulator - watchOS 6.1 | watchsimulator6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.4 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | -------------------------------------------- | +| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 | +| iOS 13.0 | iphoneos13.0 | 11.0 | +| iOS 13.1 | iphoneos13.1 | 11.1 | +| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | +| iOS 13.4 | iphoneos13.4 | 11.4 | +| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 | +| Simulator - iOS 13.1 | iphonesimulator13.1 | 11.1 | +| Simulator - iOS 13.2 | iphonesimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | +| Simulator - iOS 13.4 | iphonesimulator13.4 | 11.4 | +| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 | +| tvOS 13.2 | appletvos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | +| tvOS 13.4 | appletvos13.4 | 11.4 | +| Simulator - tvOS 13.0 | appletvsimulator13.0 | 11.0, 11.1 | +| Simulator - tvOS 13.2 | appletvsimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | +| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.4 | +| watchOS 6.0 | watchos6.0 | 11.0, 11.1 | +| watchOS 6.1 | watchos6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | +| watchOS 6.2 | watchos6.2 | 11.4 | +| Simulator - watchOS 6.0 | watchsimulator6.0 | 11.0, 11.1 | +| Simulator - watchOS 6.1 | watchsimulator6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | +| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.4 | +| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 13.0 | 11.0 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.1 | 11.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.2 | 11.2
11.2.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.4 | 11.4 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3
11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.4 | 11.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.2 | 11.4 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 13.0 | 11.0 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.1 | 11.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.2 | 11.2
11.2.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.4 | 11.4 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.3 | 11.3
11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.4 | 11.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.2 | 11.4 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | ### Android #### Android SDK Tools @@ -188,71 +190,71 @@ The following software is installed on machines with the 20200224.1 update. | tools | Android SDK Tools, Revision 26.1.1 | #### Android SDK Platform-Tools -| Package Name | Description | -| ------------------------------------------- | ------------------------------------------- | -| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 | +| Package Name | Description | +| -------------- | ------------------------------------------- | +| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 | #### Android SDK Platforms -| Package Name | Description | -| ----------------------------------- | ----------------------------------- | -| android-24 | Android SDK Platform 24, Revision 2 | -| android-25 | Android SDK Platform 25, Revision 3 | -| android-26 | Android SDK Platform 26, Revision 2 | -| android-27 | Android SDK Platform 27, Revision 3 | -| android-28 | Android SDK Platform 28, Revision 6 | -| android-29 | Android SDK Platform 29, Revision 4 | +| Package Name | Description | +| ------------ | ----------------------------------- | +| android-24 | Android SDK Platform 24, Revision 2 | +| android-25 | Android SDK Platform 25, Revision 3 | +| android-26 | Android SDK Platform 26, Revision 2 | +| android-27 | Android SDK Platform 27, Revision 3 | +| android-28 | Android SDK Platform 28, Revision 6 | +| android-29 | Android SDK Platform 29, Revision 4 | #### Android SDK Build-Tools -| Package Name | Description | -| -------------------------------------------- | -------------------------------------------- | -| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | -| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | -| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | -| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | -| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | -| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | -| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | -| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | -| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | -| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | -| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | -| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | -| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | -| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | -| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | -| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | -| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | -| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | -| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | -| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | -| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | -| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | -| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | -| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | -| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 | +| Package Name | Description | +| ---------------------- | -------------------------------------------- | +| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | +| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | +| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | +| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | +| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | +| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | +| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | +| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | +| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | +| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | +| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | +| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | +| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | +| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | +| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | +| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | +| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | +| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | +| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | +| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | +| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | +| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | +| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | +| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | +| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 | #### Android Utils -| Package Name | Version | -| ---------------- | ---------------- | -| cmake | 3.6.4111459 | -| lldb | 3.1.4508709 | -| ndk-bundle | 18.1.5063045 | -| Android Emulator | 30.0.0 | +| Package Name | Version | +| ---------------- | ------------ | +| cmake | 3.6.4111459 | +| lldb | 3.1.4508709 | +| ndk-bundle | 18.1.5063045 | +| Android Emulator | 30.0.0 | #### Android Google APIs -| Package Name | Description | -| --------------------------- | --------------------------- | -| addon-google_apis-google-21 | Google APIs, Revision 1 | -| addon-google_apis-google-22 | Google APIs, Revision 1 | -| addon-google_apis-google-23 | Google APIs, Revision 1 | -| addon-google_apis-google-24 | Google APIs, Revision 1 | +| Package Name | Description | +| --------------------------- | ----------------------- | +| addon-google_apis-google-21 | Google APIs, Revision 1 | +| addon-google_apis-google-22 | Google APIs, Revision 1 | +| addon-google_apis-google-23 | Google APIs, Revision 1 | +| addon-google_apis-google-24 | Google APIs, Revision 1 | #### Extra Packages -| Package Name | Version | -| ----------------------------------------------- | ----------------------------------------------- | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 | +| Package Name | Version | +| ----------------------------------------------- | ------- | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 | From 09ba151b88d6194a3ce864dd0a53bb43d62ee067 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Thu, 5 Mar 2020 21:38:59 +0000 Subject: [PATCH 094/106] Updating readme file for AzP.20200301.win19.1 version 20200301 --- images/win/Windows2019-Readme.md | 90 +++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 18 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 334c21e0..7eab9d90 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -The following software is installed on machines with the 20200225.0 update. +The following software is installed on machines with the 20200301.1 update. Components marked with **\*** have been upgraded since the previous version of the image. @@ -308,7 +308,7 @@ _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21 _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19 -## Azure/AzureRM Powershell modules +## AzureRM PowerShell module #### 2.1.0 @@ -316,23 +316,73 @@ This version is installed and is available via `Get-Module -ListAvailable` #### 3.8.0 This version is saved but not installed -_Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1 #### 4.2.1 This version is saved but not installed -_Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1 #### 5.1.1 This version is saved but not installed -_Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1 - +_Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1 #### 6.7.0 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 +#### 6.13.1 + +This version is saved but not installed +_Location:_ C:\Modules\azurerm_6.13.1\AzureRM\6.13.1\AzureRM.psd1 + +## Azure PowerShell module + +#### 2.1.0 + +This version is installed and is available via `Get-Module -ListAvailable` +#### 3.8.0 + +This version is saved but not installed +_Location:_ C:\Modules\azure_3.8.0\Azure\3.8.0\Azure.psd1 +#### 4.2.1 + +This version is saved but not installed +_Location:_ C:\Modules\azure_4.2.1\Azure\4.2.1\Azure.psd1 +#### 5.1.1 + +This version is saved but not installed +_Location:_ C:\Modules\azure_5.1.1\Azure\5.1.1\Azure.psd1 +#### 5.3.0 + +This version is saved but not installed +_Location:_ C:\Modules\azure_5.3.0\Azure\5.3.0\Azure.psd1 + +## Az PowerShell module + +#### 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 +#### 3.5.0 + +This version is saved but not installed +_Location:_ C:\Modules\az_3.5.0\Az\3.5.0\Az.psd1 ## TLS12 @@ -351,7 +401,7 @@ _Version:_ azure-devops 0.17.0 ## Python -_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.1 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.1 (x86)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
## PyPy @@ -373,13 +423,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64 ## Git -_Version:_ 2.25.0
+_Version:_ 2.25.1
_Environment:_ * PATH: contains location of git.exe ## Git Large File Storage (LFS) -_Version:_ 2.9.2
+_Version:_ 2.10.0
_Environment:_ * PATH: contains location of git-lfs.exe * GIT_LFS_PATH: location of git-lfs.exe @@ -441,7 +491,7 @@ _Environment:_ ## Rust (64-bit) -#### 1.41.0 +#### 1.41.1 _Location:_ C:\Rust\.cargo\bin _Environment:_ * PATH: contains the location of rustc.exe @@ -464,7 +514,7 @@ _version:_ ## Microsoft Edge _version:_ -80.0.361.57 +80.0.361.62 ## Mozilla Firefox @@ -696,7 +746,7 @@ _Environment:_ ## TypeScript -_Version:_ Version 3.8.2
+_Version:_ Version 3.8.3
## Miniconda @@ -706,7 +756,7 @@ _Environment:_ ## Azure CosmosDb Emulator -_Version:_ 2.9.1.0
+_Version:_ 2.9.2.0
_Location:_ C:\Program Files\Azure Cosmos DB Emulator\ ## 7zip @@ -735,7 +785,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## Cloud Foundry CLI @@ -750,7 +800,7 @@ _Environment:_ ## VSWhere -_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved. instanceId: 3ca3779b installDate: 2/25/2020 4:54:08 PM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-02-25T16:54:08.9471413Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId: properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname: properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe
+_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved. instanceId: 34bc4745 installDate: 3/1/2020 6:49:00 AM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-03-01T06:49:00.926083Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId: properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname: properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe
* PATH: contains location of vswhere.exe ## Kubectl @@ -764,3 +814,7 @@ _Environment:_ _Version:_ kind v0.7.0 go1.13.6 windows/amd64
_Environment:_ * PATH: contains location of kind.exe + +## bazel + +_Version:_ bazel 2.1.0
From e9e5323c93a8aa2bd854b18513eeb3a6172108b3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 01:04:14 +0300 Subject: [PATCH 095/106] fix geckodriver output --- images/linux/scripts/installers/firefox.sh | 2 +- .../linux/scripts/installers/google-chrome.sh | 2 +- .../scripts/Installers/Install-Firefox.ps1 | 39 ------------------ .../Installers/Install-SeleniumWebDrivers.ps1 | 41 +++++++++++++++++++ 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index aa920774..c98f43c5 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -49,5 +49,5 @@ if ! command -v geckodriver; then fi echo "Lastly, documenting what we added to the metadata file" -ver=`./geckodriver --version|head -1|awk '{print $2}'` +ver=`geckodriver --version | head -1 |awk '{print $2}'` DocumentInstalledItem "Geckodriver (${ver}); Gecko Driver is available via GECKOWEBDRIVER environment variable" diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 979e2b37..892380ce 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -56,4 +56,4 @@ if ! command -v chromedriver; then fi echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Chromedriver ($(chromedriver --version)); Chrome Driver is available via CHROMEWEBDRIVER environment variable" +DocumentInstalledItem "$(chromedriver --version); Chrome Driver is available via CHROMEWEBDRIVER environment variable" diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index eb6cea70..7408b728 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -25,42 +25,3 @@ pref("app.update.enabled", false);' -ItemType file -force $firefoxPreferencesFolder = Join-Path $firefoxDirectoryPath "defaults\pref" New-Item -path $firefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0); pref("general.config.filename", "mozilla.cfg");' -ItemType file -force - -Write-Host "Install Firefox WebDriver" - -$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" -$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 - -Write-Host "Geckodriver version: $($geckodriverJson.tag_name)" - - -$DriversZipFile = $geckodriverWindowsAsset.name -Write-Host "Selenium drivers download and install..." - -$FirefoxDriverPath = Join-Path $env:SystemDrive "SeleniumWebDrivers\GeckoDriver" - -# Install Firefox Web Driver -Write-Host "FireFox driver download...." -if (-not (Test-Path -Path $FireFoxDriverPath)) { - New-Item -Path $FireFoxDriverPath -ItemType "directory" -} - -$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile -$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url -try{ - Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile -} catch { - Write-Error "[!] Failed to download $DriversZipFile" - exit 1 -} - -Write-Host "FireFox driver install...." -Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force -Remove-Item -Path $DestFile -Force - - -Write-Host "Setting the environment variables" -Add-MachinePathItem -PathItem $FireFoxDriverPath -setx GeckoWebDriver "$FirefoxDriverPath" /M; - -exit 0 \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 6170a83e..31cec651 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -94,3 +94,44 @@ $PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; exit 0; + +# Install Firefox gecko Web Driver +Write-Host "Install Firefox WebDriver" + +$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" +$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 + +$geckodriverVersion = $geckodriverJson.tag_name +Write-Host "Geckodriver version: $geckodriverVersion" + +$DriversZipFile = $geckodriverWindowsAsset.name +Write-Host "Selenium drivers download and install..." + +$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" +$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; + +# Install Firefox Web Driver +Write-Host "FireFox driver download...." +if (-not (Test-Path -Path $FireFoxDriverPath)) { + New-Item -Path $FireFoxDriverPath -ItemType "directory" +} + +$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile +$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url +try{ + Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile +} catch { + Write-Error "[!] Failed to download $DriversZipFile" + exit 1 +} + +Write-Host "FireFox driver install...." +Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force +Remove-Item -Path $DestFile -Force + + +Write-Host "Setting the environment variables" +Add-MachinePathItem -PathItem $FireFoxDriverPath +setx GeckoWebDriver "$FirefoxDriverPath" /M; + +exit 0 From e031fd36fdf15e1fea684eceb0867619f32e36a9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 08:54:33 +0300 Subject: [PATCH 096/106] remove exit 0 --- images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 31cec651..2e5368ff 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -93,8 +93,6 @@ $PathValue += ";$ChromeDriverPath\"; $PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; -exit 0; - # Install Firefox gecko Web Driver Write-Host "Install Firefox WebDriver" From 5435d9a850f98115a09ca338e03fdd1e1f3b88f5 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 11:03:01 +0300 Subject: [PATCH 097/106] add zstd to win19 --- images/win/Windows2019-Azure.json | 12 ++++++++++++ images/win/scripts/Installers/Validate-Zstd.ps1 | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252..378801dd 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -497,6 +497,12 @@ "{{ template_dir }}/scripts/Installers/Install-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -776,6 +782,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Validate-Zstd.ps1 b/images/win/scripts/Installers/Validate-Zstd.ps1 index 18f3a334..afb6a030 100644 --- a/images/win/scripts/Installers/Validate-Zstd.ps1 +++ b/images/win/scripts/Installers/Validate-Zstd.ps1 @@ -15,7 +15,7 @@ else # Adding description of the software to Markdown $SoftwareName = "zstd" -$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0] +$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0].Substring(1) $Description = @" _Version:_ $zstdVersion
From c647d2d4ef048c2bb9d98df65a3a05686a095d8e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 13:33:25 +0300 Subject: [PATCH 098/106] moved Selenium drivers installation to respective browsers --- images/win/Windows2016-Azure.json | 2 +- images/win/Windows2019-Azure.json | 2 +- .../win/scripts/Installers/Install-Chrome.ps1 | 42 +++++- .../win/scripts/Installers/Install-Edge.ps1 | 35 +++++ .../scripts/Installers/Install-Firefox.ps1 | 43 ++++++ .../Installers/Install-IEWebDriver.ps1 | 32 +++++ .../Installers/Install-SeleniumWebDrivers.ps1 | 135 ------------------ 7 files changed, 153 insertions(+), 138 deletions(-) create mode 100644 images/win/scripts/Installers/Install-IEWebDriver.ps1 delete mode 100644 images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 6f749dbe..944bed8c 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -401,7 +401,7 @@ { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1" + "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1" ] }, { diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252..c8c30847 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -364,7 +364,7 @@ { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1" + "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1" ] }, { diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index aac913e7..44b58abb 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -18,7 +18,7 @@ $GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"}; $regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update"; $regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome"; -($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { +($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { New-Item -Path $_ -Force; } @@ -39,4 +39,44 @@ $regGoogleParameters | ForEach-Object { New-ItemProperty @Arguments; } +# Reinstall Chrome Web Driver +Write-Host "Install Chrome WebDriver" +$DestinationPath = "$($env:SystemDrive)\"; +$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver"; +if (-not (Test-Path -Path $ChromeDriverPath)) { + New-Item -Path $ChromeDriverPath -ItemType "directory" +} + +$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" +$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)'; +[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion; +Write-Host "Chrome version: [$ChromeVersion]"; + +$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)"; +Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]"; +Write-Host "Getting the Chrome driver version..."; +$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri; +Write-Host "Current Chrome driver version: [$ChromeDriverVersion]"; + +$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip"; +Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]"; + +$DestFile= "$ChromeDriverPath\chromedriver_win32.zip"; +$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; + +Write-Host "Chrome driver download...."; +Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile; + +Write-Host "Chrome driver install...."; +Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force; +Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force; + +Write-Host "Setting the environment variables" + +setx ChromeWebDriver "$ChromeDriverPath" /M; + +$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'; +$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'; +$PathValue += ";$ChromeDriverPath\"; +Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index e5a641a1..b84f0fc1 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -4,3 +4,38 @@ ################################################################################ choco install microsoft-edge -y + +# Install Microsoft Edge Web Driver +Write-Host "Install Edge WebDriver" +$DestinationPath = "$($env:SystemDrive)\"; + +$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver" +if (-not (Test-Path -Path $EdgeDriverPath)) { + New-Item -Path $EdgeDriverPath -ItemType "directory" +} + +$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" +$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' +[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion +$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" +$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt" +Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile + +Write-Host "Microsoft Edge driver download started" +$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile +$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip" +$DestFile = "$EdgeDriverPath\edgedriver_win64.zip" +Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile + +Write-Host "Microsoft Edge driver installation started" +Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force +Remove-Item -Path $DestFile -Force + +Write-Host "Setting the environment variables" + +setx EdgeWebDriver "$EdgeDriverPath" /M; + +$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'; +$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'; +$PathValue += ";$EdgeDriverPath\"; +Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index 7408b728..78e886cd 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -25,3 +25,46 @@ pref("app.update.enabled", false);' -ItemType file -force $firefoxPreferencesFolder = Join-Path $firefoxDirectoryPath "defaults\pref" New-Item -path $firefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0); pref("general.config.filename", "mozilla.cfg");' -ItemType file -force + +# Install Firefox gecko Web Driver +Write-Host "Install Firefox WebDriver" +$DestinationPath = "$($env:SystemDrive)\"; +$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers" + +$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" +$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 + +$geckodriverVersion = $geckodriverJson.tag_name +Write-Host "Geckodriver version: $geckodriverVersion" + +$DriversZipFile = $geckodriverWindowsAsset.name +Write-Host "Selenium drivers download and install..." + +$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" +$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; + +# Install Firefox Web Driver +Write-Host "FireFox driver download...." +if (-not (Test-Path -Path $FireFoxDriverPath)) { + New-Item -Path $FireFoxDriverPath -ItemType "directory" +} + +$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile +$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url +try{ + Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile +} catch { + Write-Error "[!] Failed to download $DriversZipFile" + exit 1 +} + +Write-Host "FireFox driver install...." +Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force +Remove-Item -Path $DestFile -Force + + +Write-Host "Setting the environment variables" +Add-MachinePathItem -PathItem $FireFoxDriverPath +setx GeckoWebDriver "$FirefoxDriverPath" /M; + +exit 0 diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/win/scripts/Installers/Install-IEWebDriver.ps1 new file mode 100644 index 00000000..7dfd8b42 --- /dev/null +++ b/images/win/scripts/Installers/Install-IEWebDriver.ps1 @@ -0,0 +1,32 @@ +################################################################################ +## File: Install-SeleniumWebDrivers.ps1 +## Desc: Install Selenium Web Drivers +################################################################################ +$DestinationPath = "$($env:SystemDrive)\"; +$DriversZipFile = "SeleniumWebDrivers.zip" +Write-Host "Destination path: [$DestinationPath]"; +Write-Host "Selenium drivers download and install..."; +try { + Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile; +} +catch { + Write-Error "[!] Failed to download $DriversZipFile"; + exit 1; +} + +$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers" +Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force; +Remove-Item $DriversZipFile; + +$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers" +$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver' + +if (-not (Test-Path -Path $SeleniumWebDriverPath)) { + New-Item -Path $SeleniumWebDriverPath -ItemType "directory" +} + +Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath + +Write-Host "Setting the environment variables" + +setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M; diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 deleted file mode 100644 index 2e5368ff..00000000 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ /dev/null @@ -1,135 +0,0 @@ -################################################################################ -## File: Install-SeleniumWebDrivers.ps1 -## Desc: Install Selenium Web Drivers -################################################################################ -$DestinationPath = "$($env:SystemDrive)\"; -$DriversZipFile = "SeleniumWebDrivers.zip" -Write-Host "Destination path: [$DestinationPath]"; -Write-Host "Selenium drivers download and install..."; -try { - Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile; -} -catch { - Write-Error "[!] Failed to download $DriversZipFile"; - exit 1; -} - -$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers" -Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force; -Remove-Item $DriversZipFile; - -$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers" -$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver' - -if (-not (Test-Path -Path $SeleniumWebDriverPath)) { - New-Item -Path $SeleniumWebDriverPath -ItemType "directory" -} - -Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath - - -# Reinstall Chrome Web Driver -$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver"; - -if (-not (Test-Path -Path $ChromeDriverPath)) { - New-Item -Path $ChromeDriverPath -ItemType "directory" -} - -$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" -$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)'; -[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion; -Write-Host "Chrome version: [$ChromeVersion]"; - -$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)"; -Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]"; -Write-Host "Getting the Chrome driver version..."; -$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri; -Write-Host "Current Chrome driver version: [$ChromeDriverVersion]"; - -$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip"; -Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]"; - -$DestFile= "$ChromeDriverPath\chromedriver_win32.zip"; -$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; - -Write-Host "Chrome driver download...."; -Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile; - -Write-Host "Chrome driver install...."; -Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force; -Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force; - -# Install Microsoft Edge Web Driver -Write-Host "Microsoft Edge driver download...." -$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver" -if (-not (Test-Path -Path $EdgeDriverPath)) { - New-Item -Path $EdgeDriverPath -ItemType "directory" -} - -$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' -[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion -$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" -$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt" -Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile - -$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile -$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip" -$DestFile = "$EdgeDriverPath\edgedriver_win64.zip" -Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile - -Write-Host "Microsoft Edge driver install...." -Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force -Remove-Item -Path $DestFile -Force - -Write-Host "Setting the environment variables" - -setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M; -setx ChromeWebDriver "$ChromeDriverPath" /M; -setx EdgeWebDriver "$EdgeDriverPath" /M; - -$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'; -$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'; -$PathValue += ";$ChromeDriverPath\"; -$PathValue += ";$EdgeDriverPath\"; -Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; - -# Install Firefox gecko Web Driver -Write-Host "Install Firefox WebDriver" - -$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" -$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 - -$geckodriverVersion = $geckodriverJson.tag_name -Write-Host "Geckodriver version: $geckodriverVersion" - -$DriversZipFile = $geckodriverWindowsAsset.name -Write-Host "Selenium drivers download and install..." - -$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" -$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; - -# Install Firefox Web Driver -Write-Host "FireFox driver download...." -if (-not (Test-Path -Path $FireFoxDriverPath)) { - New-Item -Path $FireFoxDriverPath -ItemType "directory" -} - -$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile -$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url -try{ - Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile -} catch { - Write-Error "[!] Failed to download $DriversZipFile" - exit 1 -} - -Write-Host "FireFox driver install...." -Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force -Remove-Item -Path $DestFile -Force - - -Write-Host "Setting the environment variables" -Add-MachinePathItem -PathItem $FireFoxDriverPath -setx GeckoWebDriver "$FirefoxDriverPath" /M; - -exit 0 From 908235e3ee91f11e5eade668602f065327e43cc3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 17:04:48 +0300 Subject: [PATCH 099/106] Add Analysis extension installation --- images/win/Windows2019-Azure.json | 12 +++++ .../Install-AnalysisExtenstion.ps1 | 44 +++++++++++++++++++ .../Validate-AnalysisExtenstion.ps1 | 18 ++++++++ 3 files changed, 74 insertions(+) create mode 100644 images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 create mode 100644 images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252..7b035226 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -172,6 +172,12 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Install-Wix.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1" + ] + }, { "type": "powershell", "valid_exit_codes": [ @@ -204,6 +210,12 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 new file mode 100644 index 00000000..43bfb603 --- /dev/null +++ b/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 @@ -0,0 +1,44 @@ +################################################################################### +## File: Install-AnalysisExtenstion.ps1 +## Desc: Install the Microsoft Analysis Services Projects Visual Studio extension +################################################################################### + + +$extensionUrl = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftAnalysisServicesModelingProjects/2.9.5/vspackage" +$extensionDownloadPath = Join-Path $Env:TEMP "Microsoft.DataTools.AnalysisServices.vsix" +Write-Host "Downloading Microsoft.DataTools.AnalysisServices.vsix extension" +(New-Object System.Net.WebClient).DownloadFile($extensionUrl, $extensionDownloadPath) + +Write-Host "Installing Microsoft.DataTools.AnalysisServices.vsix extension" +try +{ + $process = Start-Process ` + -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\VSIXInstaller.exe" ` + -ArgumentList ("/quiet", "$extensionDownloadPath") ` + -Wait ` + -PassThru +} +catch +{ + Write-Host "There is an error during Microsoft.DataTools.AnalysisServices.vsix installation" + $_ + exit 1 +} + + +$exitCode = $process.ExitCode + +if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed +{ + Write-Host "Microsoft.DataTools.AnalysisServices.vsix installed successfully" +} +else +{ + Write-Host "Unsuccessful exit code returned by the installation process: $exitCode." + exit 1 +} + +#Cleanup installation files +Remove-Item -Force -Confirm:$false $extensionDownloadPath + +exit $exitCode diff --git a/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 new file mode 100644 index 00000000..fad85d51 --- /dev/null +++ b/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 @@ -0,0 +1,18 @@ +################################################################################ +## File: Validate-AnalysisExtenstion.ps1 +## Desc: Validate Microsoft Analysis Services Projects Visual Studio extension +################################################################################ + +Import-Module -Name ImageHelpers -Force + +#AnalysisPackage doesn't have any proper name in the state.packages.json file, only id is available +$AnalysisPackageVersion = Get-VS19ExtensionVersion -packageName "04a86fc2-dbd5-4222-848e-911638e487fe" + +# Adding description of the software to Markdown +$SoftwareName = "Microsoft Analysis Services Projects Visual Studio Extension" + +$Description = @" +_Version:_ $AnalysisPackageVersion
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From db34108d0693695663d2eecfec8d6166aa18fb70 Mon Sep 17 00:00:00 2001 From: Nils Date: Fri, 6 Mar 2020 10:56:17 +0000 Subject: [PATCH 100/106] Make `clang-format-9` the default `clang-format` --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 4d3373c9..1ca4cde2 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -60,3 +60,4 @@ rm llvm.sh # Make Clang 9 default update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100 +update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9 100 From 531fe345a299af8661bf509af6c2d914afd3bff4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 8 Mar 2020 09:28:50 +0000 Subject: [PATCH 101/106] Fix bazelisk and mercurial output in readme (#518) * fix output * fix bazelisk output on ubuntu --- images/linux/scripts/installers/bazel.sh | 2 +- images/win/scripts/Installers/Validate-Bazel.ps1 | 2 +- images/win/scripts/Installers/Validate-Mercurial.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index d6649fce..d058d576 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -29,7 +29,7 @@ if ! command -v bazelisk; then fi # Document what was added to the image -bazelisk_version = $(bazelisk version | grep "Bazelisk version:" | cut -d ":" -f 2) +bazelisk_version="$(bazelisk version 2>null | grep "Bazelisk version:" | cut -d "v" -f 3)" echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Bazel ($(bazel --version))" diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 3fc0e3d6..9cdccda4 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -33,7 +33,7 @@ _Version:_ $(bazel --version)
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description # Adding description of Bazelisk to Markdown -$bazelisk_version = (bazelisk version | Select-String "Bazelisk version:").Split(":")[1] +$bazelisk_version = ((bazelisk version | Select-String "Bazelisk version:") -Split(" v"))[2] $SoftwareName = "bazelisk" diff --git a/images/win/scripts/Installers/Validate-Mercurial.ps1 b/images/win/scripts/Installers/Validate-Mercurial.ps1 index 6212d5f2..74299f06 100644 --- a/images/win/scripts/Installers/Validate-Mercurial.ps1 +++ b/images/win/scripts/Installers/Validate-Mercurial.ps1 @@ -15,7 +15,7 @@ else # Adding description of the software to Markdown $SoftwareName = "Mercurial" -$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+" +$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+" $MercurialVersion = $matches[0] $Description = @" From 42417eb98fff5f9d9e7bc071a2ab16fd81f1340d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sun, 8 Mar 2020 17:41:55 +0300 Subject: [PATCH 102/106] Add additional agent info (#499) * add agent additional info * add agent additional info * add agent additional info --- .../linux/scripts/installers/preimagedata.sh | 28 +++++++++++++++ images/linux/ubuntu1604.json | 12 +++++++ images/linux/ubuntu1804.json | 12 +++++++ images/win/Windows2016-Azure.json | 11 ++++++ images/win/Windows2019-Azure.json | 11 ++++++ .../scripts/Installers/Update-ImageData.ps1 | 35 +++++++++++++++++++ 6 files changed, 109 insertions(+) create mode 100644 images/linux/scripts/installers/preimagedata.sh create mode 100644 images/win/scripts/Installers/Update-ImageData.ps1 diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh new file mode 100644 index 00000000..91b36a9c --- /dev/null +++ b/images/linux/scripts/installers/preimagedata.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +imagedata_file=$IMAGEDATA_FILE +image_version=$IMAGE_VERSION +os_name=$(lsb_release -ds | sed "s/ /\\\n/g") +image_label="ubuntu-$(lsb_release -rs)" +github_url="https://github.com/actions/virtual-environments/blob" + +if [[ "$image_label" =~ "ubuntu-18" ]]; then + software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-README.md" +fi + +if [[ "$image_label" =~ "ubuntu-16" ]]; then + software_url="${github_url}/ubuntu16/${image_version}/images/linux/Ubuntu1604-README.md" +fi + +cat < $imagedata_file +[ + { + "group": "Operating System", + "detail": "${os_name}" + }, + { + "group": "Virtual Environment", + "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}" + } +] +EOF \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 7cd93f76..381c1224 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -15,6 +15,7 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "image_folder": "/imagegeneration", "commit_file": "/imagegeneration/commit.txt", + "imagedata_file": "/imagegeneration/imagedata.json", "metadata_file": "/imagegeneration/metadatafile", "installer_script_folder": "/imagegeneration/installers", "helper_script_folder": "/imagegeneration/helpers", @@ -107,6 +108,17 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/preimagedata.sh" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 4153b200..81c39eae 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -15,6 +15,7 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "image_folder": "/imagegeneration", "commit_file": "/imagegeneration/commit.txt", + "imagedata_file": "/imagegeneration/imagedata.json", "metadata_file": "/imagegeneration/metadatafile", "installer_script_folder": "/imagegeneration/installers", "helper_script_folder": "/imagegeneration/helpers", @@ -110,6 +111,17 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/preimagedata.sh" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 944bed8c..e24bd75e 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -19,6 +19,7 @@ "root_folder": "C:", "image_folder": "C:\\image", "commit_file": "C:\\image\\commit.txt", + "imagedata_file": "C:\\imagedata.json", "metadata_file": "C:\\image\\metadata.txt", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", "commit_url": "LATEST", @@ -120,6 +121,16 @@ "setx ImageOS {{user `image_os` }} /m" ] }, + { + "type": "powershell", + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "scripts":[ + "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index a8deb702..668451eb 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -19,6 +19,7 @@ "root_folder": "C:", "image_folder": "C:\\image", "commit_file": "C:\\image\\commit.txt", + "imagedata_file": "C:\\imagedata.json", "metadata_file": "C:\\image\\metadata.txt", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", "commit_id": "LATEST", @@ -120,6 +121,16 @@ "setx ImageOS {{user `image_os` }} /m" ] }, + { + "type": "powershell", + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "scripts":[ + "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 new file mode 100644 index 00000000..7cbffec0 --- /dev/null +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -0,0 +1,35 @@ +$os = Get-CimInstance -ClassName Win32_OperatingSystem +$caption = $os.Caption +$osName = $caption.Substring(0, $caption.LastIndexOf(" ")) +$osEdition = $caption.Substring($caption.LastIndexOf(" ")+1) +$osVersion = $os.Version +$imageVersion = $env:IMAGE_VERSION +$imageDataFile = $env:IMAGEDATA_FILE +$githubUrl="https://github.com/actions/virtual-environments/blob" + +if ($caption -match "2019") +{ + $imageLabel = "windows-2019" + $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" +} + +if ($caption -match "2016") +{ + $imageLabel = "windows-2016" + $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md" +} + +$json = @" +[ + { + "group": "Operating System", + "detail": "${osName}\n${osVersion}\n${osEdition}" + }, + { + "group": "Virtual Environment", + "detail": "Environment: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}" + } +] +"@ + +$json | Out-File -FilePath $imageDataFile From 6b03ec0d5878fe78face92caa6829ee0345a1cf7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 8 Mar 2020 14:43:37 +0000 Subject: [PATCH 103/106] Fix docs for gecko, swap chrome and ie drivers (#519) --- images/win/scripts/Installers/Install-Firefox.ps1 | 5 +++++ .../win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index 78e886cd..6f1dc218 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -41,6 +41,11 @@ $DriversZipFile = $geckodriverWindowsAsset.name Write-Host "Selenium drivers download and install..." $FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" + +if (-not (Test-Path -Path $FirefoxDriverPath)) { + New-Item -Path $FirefoxDriverPath -ItemType "directory" +} + $geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; # Install Firefox Web Driver diff --git a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 index e4979bd7..dd74b95e 100644 --- a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 @@ -36,9 +36,9 @@ if ( (Get-Item "$EdgeDriverPath\msedgedriver.exe").VersionInfo $versionFileName = "versioninfo.txt"; - $chromedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName" + $chromedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName" $geckodriverversion = Get-Content -Path "$GeckoDriverPath\$versionFileName" - $iedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName" + $iedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName" $edgedriverversion = Get-Content -Path "$EdgeDriverPath\$versionFileName" # Adding description of the software to Markdown From a6afca3c57a8f2b7970aa6a61ea05cd0c94ffcd7 Mon Sep 17 00:00:00 2001 From: Nelly Kiboi Date: Wed, 11 Mar 2020 07:30:39 +0000 Subject: [PATCH 104/106] Update docker compose to v1.25.4 (#524) * feat(docker-compose): update docker-compose to 1.25.4 * feat(docker-compose): remove updates to readme --- images/linux/scripts/installers/docker-compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index cd8f09eb..1ba93f99 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh -version="1.22.0" +version="1.25.4" # Install latest docker-compose from releases curl -L "https://github.com/docker/compose/releases/download/$version/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose From 05585de03b803aab81a2f023603d2428394ffcc4 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 11 Mar 2020 11:08:20 +0300 Subject: [PATCH 105/106] Install latest patch versions of golang for linux (#501) * install golang for linux --- images/linux/scripts/installers/1604/go.sh | 36 -------------- images/linux/scripts/installers/1804/go.sh | 34 ------------- images/linux/scripts/installers/go.sh | 55 ++++++++++++++++++++++ images/linux/ubuntu1604.json | 18 ++++++- images/linux/ubuntu1804.json | 18 ++++++- 5 files changed, 87 insertions(+), 74 deletions(-) delete mode 100644 images/linux/scripts/installers/1604/go.sh delete mode 100644 images/linux/scripts/installers/1804/go.sh create mode 100644 images/linux/scripts/installers/go.sh diff --git a/images/linux/scripts/installers/1604/go.sh b/images/linux/scripts/installers/1604/go.sh deleted file mode 100644 index 00aa8274..00000000 --- a/images/linux/scripts/installers/1604/go.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -################################################################################ -## File: go.sh -## Desc: Installs go, configures GOROOT, and adds go to the path -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh - -# This function installs Go using the specified arguments: -# $1=MajorVersion (1.11) -# $2=MajorAndMinorVersion (1.11.1) -# $3=IsDefaultVersion (true or false) -function InstallGo () { - curl -sL https://dl.google.com/go/go$2.linux-amd64.tar.gz -o go$2.linux-amd64.tar.gz - mkdir -p /usr/local/go$1 - tar -C /usr/local/go$1 -xzf go$2.linux-amd64.tar.gz --strip-components=1 go - rm go$2.linux-amd64.tar.gz - echo "GOROOT_${1//./_}_X64=/usr/local/go$1" | tee -a /etc/environment - DocumentInstalledItem "Go $1 ($(/usr/local/go$1/bin/go version))" - - # If this version of Go is to be the default version, - # symlink it into the path and point GOROOT to it. - if [ $3 = true ] - then - ln -s /usr/local/go$1/bin/* /usr/bin/ - echo "GOROOT=/usr/local/go$1" | tee -a /etc/environment - fi -} - -# Install Go versions -InstallGo 1.9 1.9.7 false -InstallGo 1.10 1.10.8 false -InstallGo 1.11 1.11.12 false -InstallGo 1.12 1.12.7 true -InstallGo 1.13 1.13 false diff --git a/images/linux/scripts/installers/1804/go.sh b/images/linux/scripts/installers/1804/go.sh deleted file mode 100644 index 6109faf2..00000000 --- a/images/linux/scripts/installers/1804/go.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -################################################################################ -## File: go.sh -## Desc: Installs go, configures GOROOT, and adds go to the path -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh - -# This function installs Go using the specified arguments: -# $1=MajorVersion (1.11) -# $2=MajorAndMinorVersion (1.11.1) -# $3=IsDefaultVersion (true or false) -function InstallGo () { - curl -sL https://dl.google.com/go/go$2.linux-amd64.tar.gz -o go$2.linux-amd64.tar.gz - mkdir -p /usr/local/go$1 - tar -C /usr/local/go$1 -xzf go$2.linux-amd64.tar.gz --strip-components=1 go - rm go$2.linux-amd64.tar.gz - echo "GOROOT_${1//./_}_X64=/usr/local/go$1" | tee -a /etc/environment - DocumentInstalledItem "Go $1 ($(/usr/local/go$1/bin/go version))" - - # If this version of Go is to be the default version, - # symlink it into the path and point GOROOT to it. - if [ $3 = true ] - then - ln -s /usr/local/go$1/bin/* /usr/bin/ - echo "GOROOT=/usr/local/go$1" | tee -a /etc/environment - fi -} - -# Install Go versions -InstallGo 1.11 1.11.12 false -InstallGo 1.12 1.12.7 true -InstallGo 1.13 1.13 false diff --git a/images/linux/scripts/installers/go.sh b/images/linux/scripts/installers/go.sh new file mode 100644 index 00000000..8a16eef8 --- /dev/null +++ b/images/linux/scripts/installers/go.sh @@ -0,0 +1,55 @@ +#!/bin/bash +################################################################################ +## File: go.sh +## Desc: Installs go, configures GOROOT, and adds go to the path +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh +golangTags="/tmp/golang_tags.json" + +# This function installs Go using the specified arguments: +# $1=MajorVersion (1.11) +# $2=IsDefaultVersion (true or false) +function InstallGo () { + version=$( getFullGoVersion $1 ) + downloadVersion=$version.linux-amd64.tar.gz + goFolder=/usr/local/go$1 + + echo "Install Go $version" + curl -sL https://dl.google.com/go/${downloadVersion} -o ${downloadVersion} + mkdir -p $goFolder + tar -C $goFolder -xzf $downloadVersion --strip-components=1 go + rm $downloadVersion + echo "GOROOT_${1//./_}_X64=$goFolder" | tee -a /etc/environment + DocumentInstalledItem "Go $1 ($($goFolder/bin/go version))" + + # If this version of Go is to be the default version, + # symlink it into the path and point GOROOT to it. + if [ $2 = true ] + then + ln -s $goFolder/bin/* /usr/bin/ + echo "GOROOT=$goFolder" | tee -a /etc/environment + fi +} + +function getFullGoVersion () { + local pattern="refs/tags/go$1([.0-9]{0,3})$" + local query='[.[] | select( .ref | test($pattern))] | .[-1] | .ref' + refValue=$(jq --arg pattern "$pattern" "$query" $golangTags) + version=$(echo "$refValue" | cut -d '/' -f 3) + version=$(echo "${version//\"}") # go1.12.17 + echo $version +} + +# load golang_tags.json file +curl -s 'https://api.github.com/repos/golang/go/git/refs/tags' >> $golangTags +# Install Go versions +for go in ${GO_VERSIONS}; do + echo "Installing Go ${go}" + if [[ $go == $GO_DEFAULT ]]; then + InstallGo $go true + else + InstallGo $go false + fi +done \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 381c1224..51e1bb51 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -23,7 +23,9 @@ "capture_name_prefix": "packer", "image_version": "dev", "image_os": "ubuntu16", - "github_feed_token": null + "github_feed_token": null, + "go_default": "1.14", + "go_versions": "1.11 1.12 1.13 1.14" }, "sensitive-variables": ["client_secret", "github_feed_token"], "builders": [ @@ -148,7 +150,6 @@ "{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/1604/go.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", "{{template_dir}}/scripts/installers/haskell.sh", @@ -192,6 +193,19 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/go.sh" + ], + "environment_vars": [ + "METADATA_FILE={{user `metadata_file`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "GO_VERSIONS={{user `go_versions`}}", + "GO_DEFAULT={{user `go_default`}}" + ], + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" + }, { "type": "file", "source": "{{template_dir}}/toolcache-1604.json", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 81c39eae..33800251 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -23,7 +23,9 @@ "capture_name_prefix": "packer", "image_version": "dev", "image_os": "ubuntu18", - "github_feed_token": null + "github_feed_token": null, + "go_default": "1.14", + "go_versions": "1.11 1.12 1.13 1.14" }, "sensitive-variables": ["client_secret", "github_feed_token"], "builders": [ @@ -151,7 +153,6 @@ "{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/1804/go.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", "{{template_dir}}/scripts/installers/haskell.sh", @@ -194,6 +195,19 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/go.sh" + ], + "environment_vars": [ + "METADATA_FILE={{user `metadata_file`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "GO_VERSIONS={{user `go_versions`}}", + "GO_DEFAULT={{user `go_default`}}" + ], + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" + }, { "type": "file", "source": "{{template_dir}}/toolcache-1804.json", From 9bc9285a028aa39fa510148136c8037615903061 Mon Sep 17 00:00:00 2001 From: nikita-bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Wed, 11 Mar 2020 11:16:52 +0300 Subject: [PATCH 106/106] Added installation of libc++-dev and libc++abi-dev to Ubuntu 1604 (#513) Co-authored-by: Nikita Bykov --- images/linux/scripts/installers/1604/basic.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index 99c80a31..adc1e809 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/images/linux/scripts/installers/1604/basic.sh @@ -19,6 +19,8 @@ apt-fast install -y --no-install-recommends \ iproute2 \ iputils-ping \ jq \ + libc++-dev \ + libc++abi-dev \ libcurl3 \ libicu55 \ libunwind8 \ @@ -75,6 +77,8 @@ DocumentInstalledItemIndent "ftp" DocumentInstalledItemIndent "iproute2" DocumentInstalledItemIndent "iputils-ping" DocumentInstalledItemIndent "jq" +DocumentInstalledItemIndent "libc++-dev" +DocumentInstalledItemIndent "libc++abi-dev" DocumentInstalledItemIndent "libcurl3" DocumentInstalledItemIndent "libicu55" DocumentInstalledItemIndent "libunwind8"