sort unique id

Azure · Oct 23, 2024 · 2689931 · 2689931
1 parent a2ba6f0
commit 2689931
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/tests/scripts/generate-matrix.ps1 b/.github/tests/scripts/generate-matrix.ps1
@@ -1,3 +1,7 @@
+param(
+  [string]$runNumber = "999"
+)
+
 $combinations = [ordered]@{
   azuredevops_bicep = [ordered]@{
     infrastructureAsCode = @("bicep")
@@ -106,7 +110,8 @@ function Get-MatrixRecursively {
   param(
     $calculatedCombinations = @(),
     $indexes = [ordered]@{},
-    $definition
+    $definition,
+    $runNumber
   )
 
   if($indexes.Count -eq 0) {
@@ -130,7 +135,7 @@ function Get-MatrixRecursively {
 
   $combination.Name = $name.Trim("-")
   $combination.Hash = Get-Hash $name
-  $combination.ShortName = $combination.Hash.Substring(0,5)
+  $combination.ShortName = "r" + $combination.Hash.Substring(0,5).ToLower() + "r" + $runNumber
 
   $calculatedCombinations += $combination
 
@@ -144,7 +149,7 @@ function Get-MatrixRecursively {
   }
 
   if($hasMore) {
-    $calculatedCombinations = Get-MatrixRecursively -calculatedCombinations $calculatedCombinations -indexes $indexes -definition $definition
+    $calculatedCombinations = Get-MatrixRecursively -calculatedCombinations $calculatedCombinations -indexes $indexes -definition $definition -runNumber $runNumber
   }
 
   return $calculatedCombinations
@@ -153,7 +158,7 @@ function Get-MatrixRecursively {
 $finalMatrix = @()
 
 foreach($key in $combinations.Keys) {
-  $finalMatrix += Get-MatrixRecursively -definition $combinations[$key]
+  $finalMatrix += Get-MatrixRecursively -definition $combinations[$key] -runNumber $runNumber
 }
 
 return $finalMatrix
diff --git a/.github/workflows/end-to-end-test.yml b/.github/workflows/end-to-end-test.yml
@@ -61,15 +61,15 @@ jobs:
       - name: Generate Matrix
         id: matrix
         run: |
-          $matrix = ${{ env.BOOTSTRAP_MODULE_FOLDER }}/.github/tests/scripts/generate-matrix.ps1
+          $matrix = ${{ env.BOOTSTRAP_MODULE_FOLDER }}/.github/tests/scripts/generate-matrix.ps1 -runNumber "${{ github.run_number }}"
           $matrixJson = ConvertTo-Json $matrix -Depth 10 -Compress
           Write-Host (ConvertTo-Json $matrix -Depth 10)
           Write-Output "matrix=$matrixJson" >> $env:GITHUB_OUTPUT
         shell: pwsh
 
   e2e-test:
     needs: define-matrix
-    name: "${{ matrix.name }} (${{ matrix.ShortName }}${{ github.run_number }})"
+    name: "${{ matrix.name }} (${{ matrix.ShortName }})"
     environment: ${{ github.event_name == 'schedule' && 'CSUTFAUTO' || 'CSUTF' }}
     if: "${{ github.repository == 'Azure/accelerator-bootstrap-modules' && (contains(github.event.pull_request.labels.*.name, 'PR: Safe to test 🧪') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') }}"
     strategy:
@@ -179,7 +179,7 @@ jobs:
           Write-Host "Location: $location"
           Write-Host "Location 2: $location2"
 
-          $uniqueId = "$shortName$runNumber".ToLower()
+          $uniqueId = $shortName
           echo "UNIQUE_ID=$uniqueId" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
           Write-Host "Unique ID: $uniqueId"