Enable Swagger Parser Tests (#4845)

Azure · Dec 5, 2022 · c151cca · c151cca
1 parent 441fb32
commit c151cca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
@@ -9,6 +9,12 @@ parameters:
   - name: ToolDirectory
     type: string
     default: ''
+  - name: PackageDirectory
+    type: string
+    default: ''
+  - name: TestDirectory
+    type: string
+    default: ''
   - name: DotNetCoreVersion
     type: string
     default: ''
@@ -62,7 +68,7 @@ stages:
 
           - script: 'dotnet pack /p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory) $(Warn) -c Release'
             displayName: 'Build and Package'
-            workingDirectory: $(Build.SourcesDirectory)/${{parameters.ToolDirectory}}
+            workingDirectory: '${{ coalesce(parameters.PackageDirectory, parameters.ToolDirectory) }}'
             env:
               DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
               DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -72,7 +78,7 @@ stages:
             parameters:
               StagingDirectory: $(Build.ArtifactStagingDirectory)
               BuildMatrix: ${{ parameters.StandaloneExeMatrix }}
-              TargetDirectory: $(Build.SourcesDirectory)/${{parameters.ToolDirectory}}
+              TargetDirectory: '${{ coalesce(parameters.PackageDirectory, parameters.ToolDirectory) }}'
 
           - publish: $(Build.ArtifactStagingDirectory)
             displayName: Publish package to run artifacts
@@ -90,7 +96,7 @@ stages:
 
           - script: 'dotnet test /p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory) $(Warn) --logger trx'
             displayName: 'Test'
-            workingDirectory: $(Build.SourcesDirectory)/${{parameters.ToolDirectory}}
+            workingDirectory: '${{ coalesce(parameters.TestDirectory, parameters.ToolDirectory) }}'
             env:
               DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
               DOTNET_CLI_TELEMETRY_OPTOUT: 1

diff --git a/tools/apiview/parsers/swagger-api-parser/ci.yml b/tools/apiview/parsers/swagger-api-parser/ci.yml
@@ -8,7 +8,7 @@ trigger:
       - hotfix/*
   paths:
     include:
-      - tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
+      - tools/apiview/parsers/swagger-api-parser
 
 pr:
   branches:
@@ -19,10 +19,11 @@ pr:
       - hotfix/*
   paths:
     include:
-      - tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
+      - tools/apiview/parsers/swagger-api-parser
 
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
-    ToolDirectory: tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
+    PackageDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
+    TestDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest
     SkipDotNetInstall: true