Give CI jobs a better name (#43185)

Give CI jobs a better name
Azure · Dec 6, 2024 · 6de9e6b · 6de9e6b
1 parent 0b3780a
commit 6de9e6b
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 49 deletions.
diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -87,7 +87,7 @@ jobs:
         # This will contain things such as heap dumps hprofs if testing hit OutOfMemory errors, log files captured
         # during testing if tests failed, and linting reports.
         - output: pipelineArtifact
-          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)
+          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/troubleshooting
           displayName: 'Capture troubleshooting artifacts'
           condition: and(not(succeeded()), eq(variables['HAS_TROUBLESHOOTING'], 'true'))
@@ -109,16 +109,6 @@ jobs:
         parameters:
           runProxy: true
 
-      - pwsh: |
-          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy.log
-          foreach($file in $files){
-              Write-Host "##[group]$file"
-              cat $file
-              Write-Host "##[endgroup]"
-          }
-        displayName: Dump Test-Proxy Logs
-        condition: succeededOrFailed()
-
       # If the Java test versions isn't one of the LTS versions, or in other words is the latest Java version we're
       # testing against and that isn't an LTS version at the time (ex. latest LTS is Java 17 but we're testing against
       # Java 18), then install the latest Java version and use that to run a full build for validation of the latest
@@ -159,3 +149,23 @@ jobs:
       # Shut down proxy to prevent file locks on the log file for auto-injected credscan
       # steps on windows
       - template: /eng/common/testproxy/test-proxy-tool-shutdown.yml
+
+      - pwsh: |
+          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy.log
+          foreach($file in $files){
+              Write-Host "##[group]$file"
+              cat $file
+              Write-Host "##[endgroup]"
+          }
+        displayName: Dump Test-Proxy Logs
+        condition: succeededOrFailed()
+
+#      - pwsh: |
+#          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy-error.log
+#          foreach($file in $files){
+#              Write-Host "##[group]$file"
+#              cat $file
+#              Write-Host "##[endgroup]"
+#          }
+#        displayName: Dump Test-Proxy Error Logs
+#        condition: succeededOrFailed()
diff --git a/eng/pipelines/templates/jobs/ci.versions.tests.yml b/eng/pipelines/templates/jobs/ci.versions.tests.yml
@@ -65,7 +65,7 @@ jobs:
           # This will contain things such as heap dumps hprofs if testing hit OutOfMemory errors, log files captured
           # during testing if tests failed, and linting reports.
           - output: pipelineArtifact
-            artifactName: 'troubleshooting-vo-${{ versionOverride }}-troubleshooting-$(System.StageName)-$(System.JobName)'
+            artifactName: 'troubleshooting-vo-${{ versionOverride }}-troubleshooting-$(System.StageName)-$(System.JobName)-$(System.JobAttempt)'
             targetPath: $(System.DefaultWorkingDirectory)/troubleshooting
             displayName: 'Capture troubleshooting artifacts for version override ${{ versionOverride }}'
             condition: and(not(succeeded()), eq(variables['HAS_TROUBLESHOOTING'], 'true'))
@@ -86,16 +86,6 @@ jobs:
         parameters:
           runProxy: true
 
-      - pwsh: |
-          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy.log
-          foreach($file in $files){
-              Write-Host "##[group]$file"
-              cat $file
-              Write-Host "##[endgroup]"
-          }
-        displayName: Dump Test-Proxy Logs
-        condition: succeededOrFailed()
-
       - template: /eng/pipelines/templates/steps/install-reporting-tools.yml
         parameters:
           JdkVersion: $(JavaTestVersion)
@@ -120,4 +110,26 @@ jobs:
             Write-Host "##vso[task.setvariable variable=FirstTestOverrideRan]true"
           displayName: "Reset version override changes"
 
+      - template: /eng/common/testproxy/test-proxy-tool-shutdown.yml
+
+      - pwsh: |
+          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy.log
+          foreach($file in $files){
+              Write-Host "##[group]$file"
+              cat $file
+              Write-Host "##[endgroup]"
+          }
+        displayName: Dump Test-Proxy Logs
+        condition: succeededOrFailed()
+
+#      - pwsh: |
+#          $files = Get-ChildItem -Path $(Build.SourcesDirectory) -Filter test-proxy-error.log
+#          foreach($file in $files){
+#              Write-Host "##[group]$file"
+#              cat $file
+#              Write-Host "##[endgroup]"
+#          }
+#        displayName: Dump Test-Proxy Error Logs
+#        condition: succeededOrFailed()
+
       - template: /eng/pipelines/templates/steps/post-job-cleanup.yml
diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml
@@ -62,7 +62,7 @@ jobs:
         # This will contain things such as heap dumps hprofs if testing hit OutOfMemory errors, log files captured
         # during testing if tests failed, and linting reports.
         - output: pipelineArtifact
-          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)
+          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/troubleshooting
           displayName: 'Capture troubleshooting artifacts'
           condition: and(not(succeeded()), eq(variables['HAS_TROUBLESHOOTING'], 'true'))

diff --git a/eng/pipelines/templates/jobs/native.live.tests.yml b/eng/pipelines/templates/jobs/native.live.tests.yml
@@ -102,7 +102,7 @@ jobs:
         # This will contain things such as heap dumps hprofs if testing hit OutOfMemory errors, log files captured
         # during testing if tests failed, and linting reports.
         - output: pipelineArtifact
-          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)
+          artifactName: troubleshooting-$(System.StageName)-$(System.JobName)-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/troubleshooting
           displayName: 'Capture troubleshooting artifacts'
           condition: and(not(succeeded()), eq(variables['HAS_TROUBLESHOOTING'], 'true'))

diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -1,6 +1,9 @@
 {
   "displayNames": {
-    "true": "TestFromSource"
+    "netty": "nettyhttp",
+    "okhttp": "okhttp",
+    "JdkHttpClientProvider": "jdkhttp",
+    "VertxHttpClientProvider": "vertxhttp"
   },
   "matrix": {
     "Agent": {
@@ -10,14 +13,18 @@
     },
     "JavaTestVersion": [ "1.8", "1.21" ],
     "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ],
-    "TestFromSource": false,
-    "RunAggregateReports": false,
-    "TestGoals": "surefire:test failsafe:integration-test failsafe:verify",
-    "TestOptions": ""
+    "Options": {
+      "NotFromSource_TestsOnly": {
+        "TestFromSource": false,
+        "RunAggregateReports": false,
+        "TestOptions": "",
+        "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+      }
+    }
   },
   "exclude": [
     {
-      "Pool": "env:WINDOWSPOOL",
+      "Pool": "env:LINUXPOOL",
       "JavaTestVersion": "1.21"
     }
   ],
@@ -28,59 +35,89 @@
       },
       "JavaTestVersion": "1.21",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "TestFromSource": true,
-      "RunAggregateReports": false,
-      "TestGoals": "verify",
-      "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false"
+      "Options": {
+        "FromSource_SkipRebuild_Verify": {
+          "TestFromSource": true,
+          "RunAggregateReports": false,
+          "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false",
+          "TestGoals": "verify"
+        }
+      }
     },
     {
       "Agent": {
-        "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
+        "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.21",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "TestFromSource": false,
-      "RunAggregateReports": true,
-      "TestGoals": "verify",
-      "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false"
+      "Options": {
+        "NotFromSource_AggregateReports_SkipRebuild_Verify": {
+          "TestFromSource": false,
+          "RunAggregateReports": true,
+          "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false",
+          "TestGoals": "verify"
+        }
+      }
     },
     {
       "Agent": {
         "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.11",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "TestFromSource": false,
-      "RunAggregateReports": false,
-      "TestGoals": "surefire:test failsafe:integration-test failsafe:verify",
-      "TestOptions": ""
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "",
+          "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+        }
+      }
     },
     {
       "Agent": {
         "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.17",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "TestFromSource": false,
-      "RunAggregateReports": false,
-      "TestGoals": "surefire:test failsafe:integration-test failsafe:verify",
-      "TestOptions": ""
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "",
+          "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+        }
+      }
     },
     {
       "Agent": {
         "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.17",
       "AZURE_TEST_HTTP_CLIENTS": "JdkHttpClientProvider",
-      "TestFromSource": false
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "",
+          "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+        }
+      }
     },
     {
       "Agent": {
         "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.17",
       "AZURE_TEST_HTTP_CLIENTS": "VertxHttpClientProvider",
-      "TestFromSource": false
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "",
+          "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+        }
+      }
     }
   ]
 }