diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 6d328171b..bc0e649fb 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -62,7 +62,7 @@ Function GenerateResourcesAndImage { Delete the resource group if it exists without user confirmation. .EXAMPLE - GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\azure-pipelines-image-generation" -ImageType Ubuntu1604 -AzureLocation "East US" + GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1604 -AzureLocation "East US" #> param ( [Parameter(Mandatory = $True)] diff --git a/images/linux/config/ubuntu1604.conf b/images/linux/config/ubuntu1604.conf index e9fbaed22..d2ac14231 100644 --- a/images/linux/config/ubuntu1604.conf +++ b/images/linux/config/ubuntu1604.conf @@ -1,2 +1,2 @@ -# Name of the hosted pool this image will support -POOL_NAME="Hosted Ubuntu 1604" +# Name of the pool supported by this image +POOL_NAME="Ubuntu 1604" diff --git a/images/linux/config/ubuntu1804.conf b/images/linux/config/ubuntu1804.conf index 375a9382b..bca2da8a0 100644 --- a/images/linux/config/ubuntu1804.conf +++ b/images/linux/config/ubuntu1804.conf @@ -1,2 +1,2 @@ -# Name of the hosted pool this image will support -POOL_NAME="Hosted Ubuntu 1804" +# Name of pool supported by this image +POOL_NAME="Ubuntu 1804" diff --git a/images/linux/scripts/installers/1604/preparemetadata.sh b/images/linux/scripts/installers/1604/preparemetadata.sh index 5b4c177e9..45cfcabfa 100644 --- a/images/linux/scripts/installers/1604/preparemetadata.sh +++ b/images/linux/scripts/installers/1604/preparemetadata.sh @@ -7,6 +7,6 @@ source $HELPER_SCRIPTS/document.sh -AddTitle "Hosted Ubuntu 1604 Image ($(lsb_release -ds))" -WriteItem "The following software is installed on machines in the Hosted Ubuntu 1604 ($IMAGE_VERSION) pool" +AddTitle "$(lsb_release -ds)" +WriteItem "The following software is installed on machines with the $IMAGE_VERSION update." WriteItem "***" diff --git a/images/linux/scripts/installers/1804/preparemetadata.sh b/images/linux/scripts/installers/1804/preparemetadata.sh index 61988142c..45cfcabfa 100644 --- a/images/linux/scripts/installers/1804/preparemetadata.sh +++ b/images/linux/scripts/installers/1804/preparemetadata.sh @@ -7,6 +7,6 @@ source $HELPER_SCRIPTS/document.sh -AddTitle "Hosted Ubuntu 1804 Image ($(lsb_release -ds))" -WriteItem "The following software is installed on machines in the Hosted Ubuntu 1804 (v$IMAGE_VERSION) pool" +AddTitle "$(lsb_release -ds)" +WriteItem "The following software is installed on machines with the $IMAGE_VERSION update." WriteItem "***" diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 index 335719005..e22d9da8d 100644 --- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 @@ -119,9 +119,9 @@ wmic logicaldisk get size,freespace,caption # Adding description of the software to Markdown $Content = @" -# Azure Pipelines Hosted VS2017 image +# Windows Server 2016 -The following software is installed on machines in the Azure Pipelines **Hosted VS2017** (v$env:ImageVersion) pool. +The following software is installed on machines with the $env:ImageVersion update. Components marked with **\*** have been upgraded since the previous version of the image. diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 index 83087f706..09567e71a 100644 --- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 @@ -118,9 +118,9 @@ wmic logicaldisk get size,freespace,caption # Adding description of the software to Markdown $Content = @" -# Azure Pipelines Hosted Windows 2019 with VS2019 image +# Windows Server 2019 -The following software is installed on machines in the Azure Pipelines **Hosted Windows 2019 with VS2019** (v$env:ImageVersion) pool. +The following software is installed on machines with the $env:ImageVersion update. Components marked with **\*** have been upgraded since the previous version of the image.