Merge branch 'Azure:main' into main

Author: anamikapan

.azure-pipelines/PipelineSteps/BatchGeneration/analyse-modules.ps1

@@ -82,9 +82,10 @@ foreach ($moduleName in $moduleGroup) {
         $result.Status = "Failed"
         $result.Error = $_.Exception.Message
     } finally {
-        $endTine = Get-Date
-        $result.DurationSeconds = ($endTine - $startTime).TotalSeconds
+        $endTime = Get-Date
+        $result.DurationSeconds = ($endTime - $startTime).TotalSeconds
         $results += $result
+        $result | ConvertTo-Json -Depth 5 | Write-Output
     }
 }
 

.azure-pipelines/PipelineSteps/BatchGeneration/batch-generate-modules.ps1

@@ -113,6 +113,7 @@ foreach ($moduleName in $sortedModuleNames) {
     $moduleEndTime = Get-Date
     $moduleResult.DurationSeconds = ($moduleEndTime - $moduleStartTime).TotalSeconds
     $results += $moduleResult
+    $moduleResult | ConvertTo-Json -Depth 5 | Write-Output
 }
 
 $ArtifactOutputDir = Join-Path $RepoRoot "artifacts"

.azure-pipelines/PipelineSteps/BatchGeneration/build-modules.ps1

@@ -30,9 +30,10 @@ foreach ($moduleName in $moduleGroup) {
         $result.Status = "Failed"
         $result.Error = $_.Exception.Message
     } finally {
-        $endTine = Get-Date
-        $result.DurationSeconds = ($endTine - $startTime).TotalSeconds
+        $endTime = Get-Date
+        $result.DurationSeconds = ($endTime - $startTime).TotalSeconds
         $results += $result
+        $result | ConvertTo-Json -Depth 5 | Write-Output
     }
 }
 

.azure-pipelines/PipelineSteps/BatchGeneration/filter.ps1

@@ -15,7 +15,21 @@ $artifactsDir = Join-Path $RepoRoot 'artifacts'
 
 $changedModulesDict = @{}
 $changedSubModulesDict = @{}
-if ($env:RUN_TEST_ON_ALL_MODULES -eq "True") {
+if ($env:TEST_CHANGED_MODULES_ONLY -eq 'true') {
+    Write-Host "Run test on generated folder changed modules"
+    # Only generated folder change should trigger the test
+    for ($i = 0; $i -lt $ChangedFiles.Count; $i++) {
+        if ($ChangedFiles[$i] -match '^generated/([^/]+)/([^/]+\.Autorest)/') {
+            $moduleName = $Matches[1]
+            $subModuleName = $Matches[2]
+            $subModule = "$moduleName/$subModuleName"
+            
+            $changedModulesDict[$moduleName] = $true
+            $changedSubModulesDict[$subModule] = $true
+        }
+    }
+}
+else {
     Write-Host "Run test on all modules"
     $V4ModulesFile = Join-Path $artifactsDir "generationTargets.json"
     $V4ModuleMaps = Get-Content -Raw -Path $V4ModulesFile | ConvertFrom-Json
@@ -31,20 +45,6 @@ if ($env:RUN_TEST_ON_ALL_MODULES -eq "True") {
         }
     }
 }
-else {
-    Write-Host "Run test on generated folder changed modules"
-    # Only generated folder change should trigger the test 
-    for ($i = 0; $i -lt $ChangedFiles.Count; $i++) {
-        if ($ChangedFiles[$i] -match '^generated/([^/]+)/([^/]+\.autorest)/') {
-            $moduleName = $Matches[2]
-            $subModuleName = $Matches[3]
-            $subModule = "$moduleName/$subModuleName"
-            
-            $changedModulesDict[$moduleName] = $true
-            $changedSubModulesDict[$subModule] = $true
-        }
-    }
-}
 
 $changedModules = $changedModulesDict.Keys | Sort-Object
 $changedSubModules = $changedSubModulesDict.Keys | Sort-Object
@@ -63,6 +63,11 @@ foreach ($subModule in $changedSubModules) {
 Write-Host "##[endgroup]"
 Write-Host
 
+$changedModulesRecordFile = Join-Path $artifactsDir 'filteredChangedModules.txt'
+$changedModules | Set-Content -Path $changedModulesRecordFile -Encoding UTF8
+$changedSubModulesRecordFile = Join-Path $artifactsDir 'filteredChangedSubModules.txt'
+$changedSubModules | Set-Content -Path $changedSubModulesRecordFile -Encoding UTF8
+
 $groupedBuildModules = Group-Modules -Modules $changedModules -MaxParallelJobs $MaxParallelBuildJobs
 Write-Matrix -GroupedModules $groupedBuildModules -VariableName 'buildTargets' -RepoRoot $RepoRoot
 

.azure-pipelines/PipelineSteps/BatchGeneration/notify-failed-job.ps1

@@ -15,7 +15,10 @@ $notificationContent = $notificationTemplate -replace "{{ pipelineName }}", $pip
                                             -replace "{{ pipelineUrl }}", $pipelineUrl `
                                             -replace "{{ runUrl }}", $runUrl
 
+$notificationReceivers = if ($env:NotificationReceiversOverride -and $env:NotificationReceiversOverride -ne 'none') { $env:NotificationReceiversOverride } else { $env:FailedJobNotificationReceivers }
+Write-Host "Notification receivers: $notificationReceivers"
+
 Send-Teams `
-    -to $env:FailedJobNotificationReceivers `
+    -to $notificationReceivers `
     -title "Batch Generation Job Failed" `
     -content $notificationContent

.azure-pipelines/PipelineSteps/BatchGeneration/prepare.ps1

@@ -8,7 +8,7 @@ $utilFilePath = Join-Path $RepoRoot '.azure-pipelines' 'PipelineSteps' 'BatchGen
 Import-Module $utilFilePath -Force
 
 $srcPath = Join-Path $RepoRoot 'src'
-$moduleMap = Get-AutorestV4ModuleMap -srcPath $srcPath
+$moduleMap = Get-BatchGenerationModuleMap -srcPath $srcPath
 Write-Host "Total matched modules: $($moduleMap.Count)"
 
 $modules = @($moduleMap.Keys | Sort-Object)
@@ -34,14 +34,17 @@ foreach ($moduleGroup in $groupedModules) {
     $index++
 }
 
-$generationTargetsOutputDir = Join-Path $RepoRoot "artifacts"
-if (-not (Test-Path -Path $generationTargetsOutputDir)) {
-    New-Item -ItemType Directory -Path $generationTargetsOutputDir
+$artifactsDir = Join-Path $RepoRoot "artifacts"
+if (-not (Test-Path -Path $artifactsDir)) {
+    New-Item -ItemType Directory -Path $artifactsDir
 }
-$generationTargetsOutputFile = Join-Path $generationTargetsOutputDir "generationTargets.json"
+$generationTargetsOutputFile = Join-Path $artifactsDir "generationTargets.json"
 $generationTargets | ConvertTo-Json -Depth 5 | Out-File -FilePath $generationTargetsOutputFile -Encoding utf8
 
 if ($MatrixStr -and $MatrixStr.Length -gt 1) {
     $MatrixStr = $MatrixStr.Substring(1)
 }
 Write-Host "##vso[task.setVariable variable=generationTargets;isOutput=true]{$MatrixStr}"
+
+$V4ModulesRecordFile = Join-Path $artifactsDir 'preparedV4Modules.txt'
+$modules | Set-Content -Path $V4ModulesRecordFile -Encoding UTF8

.azure-pipelines/PipelineSteps/BatchGeneration/test-modules.ps1

@@ -56,6 +56,7 @@ foreach ($subModule in $subModuleGroup) {
         $endTime = Get-Date
         $result.DurationSeconds = ($endTime - $startTime).TotalSeconds
         $results += $result
+        $result | ConvertTo-Json -Depth 5 | Write-Output
     }
 }
 

.azure-pipelines/PipelineSteps/BatchGeneration/util.psm1

@@ -1,18 +1,41 @@
-function Get-AutorestV4ModuleMap {
+function Get-BatchGenerationModuleMap {
     param (
         [string]$srcPath
     )
-    
+    $skippedModules = $env:SKIPPED_MODULES -split ',' | ForEach-Object { $_.Trim() }
+    $selectedTargetModules = @{}
+    if ($env:SELECTED_TARGET_MODULES -ne "none") {
+        $env:SELECTED_TARGET_MODULES -split ',' | ForEach-Object {
+            $key = $_.Trim()
+            if ($key -ne '') {
+                $selectedTargetModules[$key] = $true
+            }
+        }
+    }
     $result = @{}
+    $modules = Get-ChildItem -Path $srcPath -Directory
 
-    Get-ChildItem -Path $srcPath -Directory | ForEach-Object {
-        $module = $_
+    foreach($module in $modules) {
+        if ($skippedModules -contains $module.Name) {
+            Write-Warning "Skipping module: $($module.Name) as it is in the skipped modules list."
+            continue
+        }
+
+        if ($selectedTargetModules.Count -gt 0 -and -not $selectedTargetModules.ContainsKey($module.Name)) {
+            Write-Warning "Skipping module: $($module.Name) as it is not in the selected target modules list."
+            continue
+        }
 
-        Get-ChildItem -Path $module.FullName -Directory | Where-Object { 
+        $subModules = Get-ChildItem -Path $module.FullName -Directory | Where-Object { 
             $_.Name -like '*.autorest'
-        } | ForEach-Object {
-            $subModule = $_
-            
+        }
+        foreach ($subModule in $subModules) {
+            $tspPath = Join-Path $subModule.FullName 'tsp-location.yaml'
+            if (Test-Path $tspPath){
+                Write-Warning "tsp-location.yaml found in $($subModule.FullName), skipping."
+                continue
+            }
+                       
             $readmePath = Join-Path $subModule.FullName 'README.md'
 
             if (Test-Path $readmePath) {
@@ -66,18 +89,19 @@ function Write-Matrix {
         [string]$RepoRoot
     )
 
-    Write-Host "$VariableName module groups: $($GroupedModules.Count)"
-    $GroupedModules | ForEach-Object { $_ -join ', ' } | ForEach-Object { Write-Host $_ }
-
+    Write-Host "##[group]$VariableName module groups: $($GroupedModules.Count)"
     $targets = @{}
     $MatrixStr = ""
     $index = 0
     foreach ($modules in $GroupedModules) {
         $key = ($index + 1).ToString() + "-" + $modules.Count
         $MatrixStr = "$MatrixStr,'$key':{'MatrixKey':'$key'}"
         $targets[$key] = $modules
+        $moduleNamesStr = $modules -join ', '
+        Write-Host "$key : $moduleNamesStr"
         $index++
     }
+    Write-Host "##[endgroup]"
 
     if ($MatrixStr -and $MatrixStr.Length -gt 1) {
         $MatrixStr = $MatrixStr.Substring(1)
@@ -91,6 +115,7 @@ function Write-Matrix {
     }
     $targetsOutputFile = Join-Path $targetsOutputDir "$VariableName.json"
     $targets | ConvertTo-Json -Depth 5 | Out-File -FilePath $targetsOutputFile -Encoding utf8
+    Write-Host
 }
 
 function Get-Targets {

.azure-pipelines/batch-generation.yml

@@ -1,3 +1,22 @@
+parameters:
+- name: TestChangedModulesOnly
+  type: boolean
+  default: true
+# Selected modules to generate, build, analyze and test
+- name: SelectedTargetModules
+  type: string
+  default: 'None'
+- name: NotificationReceiversOverride
+  type: string
+  default: 'None'
+# branch from when creating the generation branch
+- name: GenerationBaseBranch
+  type: string
+  default: 'main'
+- name: PrepareModulesOnGenerationBranch
+  type: boolean
+  default: false
+
 variables:
   IntermediateStepTimeoutInMinutes: 30
   GenerateTimeoutInMinutes: 120
@@ -33,6 +52,22 @@ stages:
       pool: ${{ variables.WindowsAgentPoolName }}
       steps:
 
+      - task: PowerShell@2
+        name: showVariables
+        displayName: 'Show Variables'
+        inputs:
+          targetType: inline
+          pwsh: true
+          script: |
+            Write-Host "Pipeline variable SkippedModules: $($env:SkippedModules)"
+            Write-Host "Pipeline variable FailedJobNotificationReceivers: $($env:FailedJobNotificationReceivers)"
+
+            Write-Host "Parameter TestChangedModulesOnly: ${{ parameters.TestChangedModulesOnly }}"
+            Write-Host "Parameter SelectedTargetModules: ${{ parameters.SelectedTargetModules }}"
+            Write-Host "Parameter NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}"
+            Write-Host "Parameter GenerationBaseBranch: ${{ parameters.GenerationBaseBranch }}"
+            Write-Host "Parameter PrepareModulesOnGenerationBranch: ${{ parameters.PrepareModulesOnGenerationBranch }}"
+
       # TODO: (Bernard) Uncomment the no checkout step after automatically install repo into agents 
       # - checkout: none
       - checkout: self
@@ -53,7 +88,7 @@ stages:
             $token = "$(GitHubToken)"
 
             $createBranchPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'create-branch.ps1'
-            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "$(GenerationBaseBranch)" -NewBranch $generationBranch -Token $token
+            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "${{ parameters.GenerationBaseBranch }}" -NewBranch $generationBranch -Token $token
             Write-Host "##vso[task.setvariable variable=GenerationBranch;isOutput=true]$generationBranch"
 
       - task: PowerShell@2
@@ -76,8 +111,18 @@ stages:
           targetType: inline
           pwsh: true
           script: |
+            if ($env:PREPARE_MODULES_ON_GENERATION_BRANCH -eq 'true') {
+              Write-Host "Checkout to GenerationBranch: $(checkout.GenerationBranch)"
+              git fetch origin "$(checkout.GenerationBranch)"
+              git checkout "$(checkout.GenerationBranch)"
+            }
+
             $prepareModulesPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'prepare.ps1'
             & $prepareModulesPath -RepoRoot "$(Build.SourcesDirectory)" -MaxParallelJobs "${{ variables.MaxParallelGenerateJobs }}"
+        env:
+          SKIPPED_MODULES: $(SkippedModules)
+          SELECTED_TARGET_MODULES: ${{ parameters.SelectedTargetModules }}
+          PREPARE_MODULES_ON_GENERATION_BRANCH: ${{ parameters.PrepareModulesOnGenerationBranch }}
 
       - task: PublishPipelineArtifact@1
         displayName: 'Upload generated targets'
@@ -212,7 +257,7 @@ stages:
               -ChangedFiles $changedFiles `
               -RepoRoot "$(Build.SourcesDirectory)"
         env:
-            RUN_TEST_ON_ALL_MODULES: $(RUN_TEST_ON_ALL_MODULES)
+            TEST_CHANGED_MODULES_ONLY: ${{ parameters.TestChangedModulesOnly }}
 
       - task: PublishPipelineArtifact@1
         displayName: 'Upload filtered targets'
@@ -507,3 +552,4 @@ stages:
             env:
               TEAMS_URL: $(TEAMS_URL)
               FailedJobNotificationReceivers: $(FailedJobNotificationReceivers)
+              NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}