From 3909bd50a450d9e54afe72caca713795e706c5ad Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Fri, 24 Jul 2020 15:56:17 -0700
Subject: [PATCH 1/4] Run only analyse dependency step for aggregate report

---
 eng/pipelines/aggregate-reports.yml           |  4 ---
 eng/pipelines/templates/steps/analyze.yml     | 32 ++++---------------
 .../templates/steps/analyze_dependency.yml    | 27 ++++++++++++++++
 3 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 eng/pipelines/templates/steps/analyze_dependency.yml

diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
index 2c8d11b79b88..2a2f10128e73 100644
--- a/eng/pipelines/aggregate-reports.yml
+++ b/eng/pipelines/aggregate-reports.yml
@@ -1,10 +1,6 @@
 trigger: none
 pr: none
 
-variables:
-  Skip.MyPy: true
-  Skip.Pylint: true
-  Skip.ApiStubGen: true
 
 jobs:
 - job: 'ValidateDependencies'
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index eae12578bda1..bc15a2873622 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -5,31 +5,7 @@ parameters:
   AdditionalTestArgs: ''
 
 steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python $(PythonVersion)'
-    inputs:
-     versionSpec: '$(PythonVersion)'
-
-  - task: DownloadPipelineArtifact@0
-    inputs:
-      artifactName: 'artifacts'
-      targetPath: $(Build.ArtifactStagingDirectory)
-
-  - script: |
-     pip install -r eng/ci_tools.txt
-     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
-    displayName: 'Verify Readmes'
-
-  - pwsh: |
-      mkdir "$(Build.ArtifactStagingDirectory)/reports"
-      Copy-Item -Path "$(Build.SourcesDirectory)/eng/common/InterdependencyGraph.html" -Destination "$(Build.ArtifactStagingDirectory)/reports/InterdependencyGraph.html"
-    displayName: 'Populate Reports Staging Folder'
-
-  - task: PythonScript@0
-    displayName: 'Analyze dependencies'
-    inputs:
-     scriptPath: 'scripts/analyze_deps.py'
-     arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports/data.js"'
+  - template: ./templates/steps/analyze_dependency.yml
 
   - task: PythonScript@0
     displayName: 'Verify Change Log'
@@ -97,6 +73,12 @@ steps:
       BuildTargetingString: ${{ parameters.BuildTargetingString }}
       TestMarkArgument: ${{ parameters.TestMarkArgument }}
 
+  - task: DownloadPipelineArtifact@0
+    condition: ne(variables['Skip.ApiStubGen'],'true')
+    inputs:
+      artifactName: 'artifacts'
+      targetPath: $(Build.ArtifactStagingDirectory)
+
   - template: ../steps/run_apistub.yml
     parameters:
       ServiceDirectory: ${{ parameters.ServiceDirectory }}
diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml
new file mode 100644
index 000000000000..26073deae4bc
--- /dev/null
+++ b/eng/pipelines/templates/steps/analyze_dependency.yml
@@ -0,0 +1,27 @@
+parameters:
+  BuildTargetingString: 'azure-*'
+  ServiceDirectory: ''
+  TestMarkArgument: ''
+  AdditionalTestArgs: ''
+
+steps:
+  - task: UsePythonVersion@0
+    displayName: 'Use Python $(PythonVersion)'
+    inputs:
+     versionSpec: '$(PythonVersion)'
+
+  - script: |
+     pip install -r eng/ci_tools.txt
+     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
+    displayName: 'Verify Readmes'
+
+  - pwsh: |
+      mkdir "$(Build.ArtifactStagingDirectory)/reports"
+      Copy-Item -Path "$(Build.SourcesDirectory)/eng/common/InterdependencyGraph.html" -Destination "$(Build.ArtifactStagingDirectory)/reports/InterdependencyGraph.html"
+    displayName: 'Populate Reports Staging Folder'
+
+  - task: PythonScript@0
+    displayName: 'Analyze dependencies'
+    inputs:
+     scriptPath: 'scripts/analyze_deps.py'
+     arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports/data.js"'
\ No newline at end of file

From df9b63024b99a9ef4f0bb3915d54648ecedad210 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:12:17 -0700
Subject: [PATCH 2/4] Change path to actual instead of relative for template
 yml

---
 eng/pipelines/aggregate-reports.yml       | 2 +-
 eng/pipelines/templates/steps/analyze.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
index 2a2f10128e73..629bee369cff 100644
--- a/eng/pipelines/aggregate-reports.yml
+++ b/eng/pipelines/aggregate-reports.yml
@@ -15,7 +15,7 @@ jobs:
     parameters:
       Directory: ""
 
-  - template: ./templates/steps/analyze.yml
+  - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
   - task: AzureFileCopy@2
     displayName: 'Upload dependency report'
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index bc15a2873622..9a33da0b54a8 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -5,7 +5,7 @@ parameters:
   AdditionalTestArgs: ''
 
 steps:
-  - template: ./templates/steps/analyze_dependency.yml
+  - template: /eng/common/pipelines/templates/steps/analyze_dependency.yml
 
   - task: PythonScript@0
     displayName: 'Verify Change Log'

From 1252abfa6ac7acab496941a1b06f61633727d572 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Fri, 24 Jul 2020 17:13:29 -0700
Subject: [PATCH 3/4] Fix yaml path

---
 eng/pipelines/templates/steps/analyze.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index 9a33da0b54a8..e518ef1efd9a 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -5,7 +5,7 @@ parameters:
   AdditionalTestArgs: ''
 
 steps:
-  - template: /eng/common/pipelines/templates/steps/analyze_dependency.yml
+  - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
   - task: PythonScript@0
     displayName: 'Verify Change Log'

From 7f6b09e8374ec787ff52b73d5b4714a7336cd4ed Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Mon, 27 Jul 2020 11:23:07 -0700
Subject: [PATCH 4/4] Removed usused parameters

---
 eng/pipelines/templates/steps/analyze_dependency.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml
index 26073deae4bc..77ab69df6dd3 100644
--- a/eng/pipelines/templates/steps/analyze_dependency.yml
+++ b/eng/pipelines/templates/steps/analyze_dependency.yml
@@ -1,9 +1,3 @@
-parameters:
-  BuildTargetingString: 'azure-*'
-  ServiceDirectory: ''
-  TestMarkArgument: ''
-  AdditionalTestArgs: ''
-
 steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python $(PythonVersion)'