update some steps in collect CI result (Azure#20459)

azure-sdk · Dec 19, 2022 · 4036a60 · 4036a60
1 parent 16153bb
commit 4036a60
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/tools/ExecuteCIStep.ps1 b/tools/ExecuteCIStep.ps1
@@ -132,28 +132,38 @@ If ($Build)
             {
                 $ModuleBuildInfoList += @{
                     Module = "Az.$ModuleName";
-                    Status = "Success";
+                    Status = "Succeeded";
                     Content = "";
                 }
             }
             Else
             {
                 $Content = "|Type|Code|Position|Detail|`n|---|---|---|---|`n"
+                $ErrorCount = 0
                 ForEach ($BuildResult In $BuildResultOfModule)
                 {
                     If ($BuildResult.Type -Eq "Error")
                     {
                         $ErrorTypeEmoji = "❌"
+                        $ErrorCount += 1
                     }
                     ElseIf ($BuildResult.Type -Eq "Warning")
                     {
                         $ErrorTypeEmoji = "⚠️"
                     }
                     $Content += "|$ErrorTypeEmoji|$($BuildResult.Code)|$($BuildResult.Position)|$($BuildResult.Detail)|`n"
                 }
+                If ($ErrorCount -Eq 0)
+                {
+                    $Status = "Warning"
+                }
+                Else
+                {
+                    $Status = "Failed"
+                }
                 $ModuleBuildInfoList += @{
                     Module = "Az.$ModuleName";
-                    Status = "Failed";
+                    Status = $Status;
                     Content = $Content;
                 }
             }
@@ -162,16 +172,6 @@ If ($Build)
             Platform = $Platform;
             Modules = $ModuleBuildInfoList;
         }
-        If ($BuildResultArray.Length -Ne 0)
-        {
-            $BuildDetail.Status = "Failed"
-            $DependencyStepStatus = "Canceled"
-        }
-        Else
-        {
-            $BuildDetail.Status = "Success"
-            $DependencyStepStatus = "Running"
-        }
         $Template.Build.Details += $BuildDetail
 
         $DependencyStepList = $Template | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object { $_ -Ne "build" }
@@ -188,7 +188,6 @@ If ($Build)
                 }
             }
             $Detail = @{
-                Status = $DependencyStepStatus;
                 Modules = $ModuleInfoList;
             }
             $Template.$DependencyStep.Details += $Detail

diff --git a/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1 b/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1
@@ -93,9 +93,17 @@ ForEach ($Step In $Steps)
             $ModuleName = $ModuleInfo.Module
 
             $ErrorIssues = $Issues | Where-Object { $_.Module -Eq $ModuleName -And $_.Severity -Lt 2 }
+            $WaringIssues = $Issues | Where-Object { $_.Module -Eq $ModuleName -And $_.Severity -Ge 2 }
             If ($ErrorIssues.Length -Eq 0)
             {
-                $ModuleInfo.Status = "Success"
+                If ($WaringIssues.Length -Eq 0)
+                {
+                    $ModuleInfo.Status = "Succeeded"
+                }
+                Else
+                {
+                    $ModuleInfo.Status = "Warning"
+                }
             }
             Else
             {
@@ -141,15 +149,6 @@ ForEach ($Step In $Steps)
                 $ModuleInfo.Content = $Content
             }
         }
-
-        If (($Issues | Where-Object {  $_.Severity -Lt 2 }).Length -Eq 0)
-        {
-            $Details.Status = "Success"
-        }
-        Else
-        {
-            $Details.Status = "Failed"
-        }
     }
 }