Sync eng/common directory with azure-sdk-tools for PR 1559 (Azure#18064)

* Handle empty files in Test-SampleMetadata Relates to Azure/azure-sdk-for-java#20684 * Remove condition from verify-samples * Use forward slash in path * Fix directory typo * Remove invalid 'telemetry' product slug Relates to Azure#17991 * Disable verify-samples template Opened Azure#18066 to track re-enabling it. Co-authored-by: Heath Stewart <heaths@microsoft.com>
AzureSDKAutomation · Apr 15, 2021 · f394ae8 · f394ae8
1 parent 6fb418f
commit f394ae8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/eng/common/pipelines/templates/steps/verify-samples.yml b/eng/common/pipelines/templates/steps/verify-samples.yml
@@ -5,15 +5,11 @@ parameters:
   - name: ScriptDirectory
     type: string
     default: eng/common/scripts
-  - name: Condition
-    type: boolean
-    default: succeeded()
 
 steps:
   - pwsh: |
       # If the last path segment is an absolute path it will be used entirely.
-      $root = [System.IO.Path]::Combine('$(Build.SourcesDireectory)', 'sdk', '${{ parameters.ServiceDirectory }}')
-      Get-ChildItem $root -Filter *.md -Recurse | ${{ parameters.ScriptDirectory }}\Test-SampleMetadata.ps1 -AllowParentProducts
+      $root = [System.IO.Path]::Combine('$(Build.SourcesDirectory)', 'sdk', '${{ parameters.ServiceDirectory }}')
+      Get-ChildItem $root -Filter *.md -Recurse | ${{ parameters.ScriptDirectory }}/Test-SampleMetadata.ps1 -AllowParentProducts
     displayName: Verify sample metadata
     workingDirectory: $(Build.SourcesDirectory)
-    condition: ${{ parameters.Condition }}
diff --git a/eng/common/scripts/Test-SampleMetadata.ps1 b/eng/common/scripts/Test-SampleMetadata.ps1
@@ -31,11 +31,13 @@ process {
         }
 
         [string[]] $content = $file | Get-Content
-        if (!$content[0].StartsWith('---')) {
+        if (!$content -or !$content[0].StartsWith('---')) {
             Write-Verbose "Skipping $($file.FullName): does not contain frontmatter"
             continue
         }
 
+        Write-Verbose "Checking $($file.FullName)"
+
         # Reset metadata and create mutable collections.
         $products = [System.Collections.Generic.List[string]]::new()
 

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
@@ -23,9 +23,9 @@ steps:
           ServiceName: ${{parameters.ServiceDirectory}}
           ForRelease: false
 
-  - template: /eng/common/pipelines/templates/steps/verify-samples.yml
-    parameters:
-      ServiceDirectory: ${{parameters.ServiceDirectory}}
+# - template: /eng/common/pipelines/templates/steps/verify-samples.yml
+#   parameters:
+#     ServiceDirectory: ${{parameters.ServiceDirectory}}
 
     # Using --always-succeed so as not to block the build. Once package
     # target is based on data available per-package the --always-succeed should

diff --git a/sdk/core/azure-core-tracing-opentelemetry/samples/README.md b/sdk/core/azure-core-tracing-opentelemetry/samples/README.md
@@ -4,7 +4,6 @@ languages:
   - python
 products:
   - azure
-  - azure-core-tracing-opentelemetry
 urlFragment: azure-core-tracing-opentelemetry-samples
 ---
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ languages: @@
       - python
     products:
       - azure
-      - azure-core-tracing-opentelemetry
     urlFragment: azure-core-tracing-opentelemetry-samples
     ---
@@ Expand Down @@