From 6e2c7374f1de29a6aaa22453698a19625a326a1f Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Thu, 5 Nov 2020 17:39:30 -0800 Subject: [PATCH 1/8] Add inventory pipeline for PS modules --- eng/pipelines/inventory.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 eng/pipelines/inventory.yml diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml new file mode 100644 index 00000000000..3ec795231f1 --- /dev/null +++ b/eng/pipelines/inventory.yml @@ -0,0 +1,25 @@ +# Inventory PowerShell modules installed + +trigger: none + +strategy: + maxParallel: 3 + matrix: + Linux: + OSVmImage: ubuntu-18.04 + Windows: + OSVmImage: windows-2019 + MacOS: + OSVmImage: maxOS-10.15 + +pool: + vmImage: $(OSVmImage) + +steps: +- bash: sudo chown -R runner ~/.Azure + displayName: (MacOS) Grant access to ~/.Azure + condition: contains(variables['OSVmImage'], 'mac') + +- pwsh: | + /eng/common/TestResources/Import-AzModules.ps1 + Get-Module -List From f2bd3dace791294c31634704a4899f324a4cbe1b Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Thu, 5 Nov 2020 17:49:54 -0800 Subject: [PATCH 2/8] Fix pipeline --- eng/pipelines/inventory.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index 3ec795231f1..ede9b6c7466 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -10,7 +10,7 @@ strategy: Windows: OSVmImage: windows-2019 MacOS: - OSVmImage: maxOS-10.15 + OSVmImage: macOS-10.15 pool: vmImage: $(OSVmImage) @@ -21,5 +21,5 @@ steps: condition: contains(variables['OSVmImage'], 'mac') - pwsh: | - /eng/common/TestResources/Import-AzModules.ps1 + ../common/TestResources/Import-AzModules.ps1 Get-Module -List From 36f91389d2367085b01cbb7d0a04edacc8791c8d Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Thu, 5 Nov 2020 17:51:59 -0800 Subject: [PATCH 3/8] Try again --- eng/pipelines/inventory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index ede9b6c7466..c198648216a 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -21,5 +21,5 @@ steps: condition: contains(variables['OSVmImage'], 'mac') - pwsh: | - ../common/TestResources/Import-AzModules.ps1 + eng/common/TestResources/Import-AzModules.ps1 Get-Module -List From 7e6c77a28f04805322a28de183bbac5fd085f9af Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Mon, 23 Jan 2023 09:32:45 -0800 Subject: [PATCH 4/8] Show `dotnet --info` --- eng/pipelines/inventory.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index c198648216a..cca0929667b 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -20,6 +20,8 @@ steps: displayName: (MacOS) Grant access to ~/.Azure condition: contains(variables['OSVmImage'], 'mac') +- bash: dotnet --info + - pwsh: | eng/common/TestResources/Import-AzModules.ps1 Get-Module -List From aa60cc1976db40aadbbe58ea637def7fcd044336 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Mon, 23 Jan 2023 09:41:38 -0800 Subject: [PATCH 5/8] Add custom agents as well --- eng/pipelines/inventory.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index cca0929667b..c2302a67bd6 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -6,13 +6,26 @@ strategy: maxParallel: 3 matrix: Linux: - OSVmImage: ubuntu-18.04 + Pool: Azure Pipelines + OSVmImage: ubuntu-latest Windows: - OSVmImage: windows-2019 + Pool: Azure Pipelines + OSVmImage: windows-latest MacOS: - OSVmImage: macOS-10.15 + Pool: Azure Pipelines + OSVmImage: macOS-latest + CustomLinux: + Pool: azsdk-pool-mms-ubuntu-2004-general + OSVmImage: MMSUbuntu20.04 + CustomWindows: + Pool: azsdk-pool-mms-win-2022-general + OSVmImage: MMS2022 + CustomMacOS: + Pool: Azure Pipelines + OSVmImage: macos-11 pool: + name: $(Pool) vmImage: $(OSVmImage) steps: From e6594702fc808b287cac8377b691925e5b8adef0 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Tue, 5 Dec 2023 14:49:06 -0800 Subject: [PATCH 6/8] Update inventory scripts --- eng/pipelines/inventory.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index c2302a67bd6..a89db345da2 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -33,8 +33,13 @@ steps: displayName: (MacOS) Grant access to ~/.Azure condition: contains(variables['OSVmImage'], 'mac') +- bash: az --version + displayName: Az CLI info + - bash: dotnet --info + displayName: .NET information - pwsh: | - eng/common/TestResources/Import-AzModules.ps1 + eng/common/scripts/Import-AzModules.ps1 Get-Module -List + displayName: Az PowerShell info From 4a78b7eafb33873203f72ec83f31490bfc2ef382 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Tue, 5 Dec 2023 17:09:48 -0800 Subject: [PATCH 7/8] Remove maxParallel --- eng/pipelines/inventory.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/inventory.yml index a89db345da2..20931485ccd 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/inventory.yml @@ -3,7 +3,6 @@ trigger: none strategy: - maxParallel: 3 matrix: Linux: Pool: Azure Pipelines From 893c88008f407ce1771bc1c43a764912049f54d7 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Thu, 7 Dec 2023 15:26:51 -0800 Subject: [PATCH 8/8] Resolve PR feedback --- .../{inventory.yml => agent-software-inventory.yml} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename eng/pipelines/{inventory.yml => agent-software-inventory.yml} (88%) diff --git a/eng/pipelines/inventory.yml b/eng/pipelines/agent-software-inventory.yml similarity index 88% rename from eng/pipelines/inventory.yml rename to eng/pipelines/agent-software-inventory.yml index 20931485ccd..97a16ea51de 100644 --- a/eng/pipelines/inventory.yml +++ b/eng/pipelines/agent-software-inventory.yml @@ -13,9 +13,12 @@ strategy: MacOS: Pool: Azure Pipelines OSVmImage: macOS-latest - CustomLinux: + CustomLinux20: Pool: azsdk-pool-mms-ubuntu-2004-general OSVmImage: MMSUbuntu20.04 + CustomLinux22: + Pool: azsdk-pool-mms-ubuntu-2204-general + OSVmImage: MMSUbuntu22.04 CustomWindows: Pool: azsdk-pool-mms-win-2022-general OSVmImage: MMS2022