From a1397253ef18bbd41dc39751312b48b78c1267e0 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Fri, 23 Apr 2021 17:42:55 -0700
Subject: [PATCH 1/4] move verify-links directly into analyze.yml.

---
 eng/pipelines/templates/jobs/ci.yml       |  9 ---------
 eng/pipelines/templates/steps/analyze.yml | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index f24dd9e67487..01136337ee81 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -83,15 +83,6 @@ jobs:
       vmImage: MMSUbuntu18.04
 
     steps:
-    - template: /eng/common/pipelines/templates/steps/verify-links.yml
-      parameters:
-        ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-          Directory: ''
-          Urls: (eng/common/scripts/get-markdown-files-from-changed-files.ps1)
-        ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-          Directory: sdk/${{ parameters.ServiceDirectory }}
-        CheckLinkGuidance: $true
-
     - template: ../steps/analyze.yml
       parameters:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index 2fa3a873199c..17f686729616 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -9,6 +9,16 @@ parameters:
 steps:
   - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
+  - template: /eng/common/pipelines/templates/steps/verify-links.yml
+    parameters:
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        Directory: ''
+        Urls: (eng/common/scripts/get-markdown-files-from-changed-files.ps1)
+      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        Directory: sdk/${{ parameters.ServiceDirectory }}
+      CheckLinkGuidance: $true
+      Condition: succeededOrFailed()
+
   - template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
     parameters:
       PackageName: "azure-template"

From 71dabd782b0b69bb9d6ada59fd8c8b51bf29cd9e Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 28 Apr 2021 12:26:05 -0700
Subject: [PATCH 2/4] ensure that dev_reqs are installed before verify sdist.
 put verify-links back where it was. change conditions to always analyze deps

---
 eng/pipelines/templates/jobs/ci.yml           |  9 ++++++++
 eng/pipelines/templates/steps/analyze.yml     | 22 ++++++-------------
 .../templates/steps/analyze_dependency.yml    |  4 ++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index 01136337ee81..f800b08ad022 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -83,6 +83,15 @@ jobs:
       vmImage: MMSUbuntu18.04
 
     steps:
+    - template: /eng/common/pipelines/templates/steps/verify-links.yml
+      parameters:
+        ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+          Directory: ''
+          Urls: (eng/common/scripts/get-markdown-files-from-changed-files.ps1)
+        ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+          Directory: sdk/${{ parameters.ServiceDirectory }}
+        CheckLinkGuidance: $true
+        
     - template: ../steps/analyze.yml
       parameters:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index 17f686729616..cb022d2e5a15 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -9,16 +9,6 @@ parameters:
 steps:
   - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
-  - template: /eng/common/pipelines/templates/steps/verify-links.yml
-    parameters:
-      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        Directory: ''
-        Urls: (eng/common/scripts/get-markdown-files-from-changed-files.ps1)
-      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        Directory: sdk/${{ parameters.ServiceDirectory }}
-      CheckLinkGuidance: $true
-      Condition: succeededOrFailed()
-
   - template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
     parameters:
       PackageName: "azure-template"
@@ -41,11 +31,7 @@ steps:
     # target is based on data available per-package the --always-succeed should
     # be removed so this script can help enforce correct practices
     # (https://github.com/Azure/azure-sdk-for-python/issues/8697)
-  - script: |
-      cd eng/versioning
-      pip install -r requirements.txt
-      python find_invalid_versions.py --always-succeed --service=${{parameters.ServiceDirectory}}
-    displayName: Find Invalid Versions
+
 
   - pwsh: |
       Get-ChildItem $(Build.SourcesDirectory) -Filter "*.py" |
@@ -73,6 +59,12 @@ steps:
     condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
     displayName: 'Component Detection'
 
+  - pwsh: |
+     pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })
+     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
+    displayName: 'Install Necessary Dependencies'
+    condition: succeededOrFailed()
+
   - task: PythonScript@0
     displayName: 'Verify sdist'
     condition: and(succeededOrFailed(), ne(variables['Skip.VerifySdist'],'true'))
diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml
index a82760dd83d5..fb18ca32035c 100644
--- a/eng/pipelines/templates/steps/analyze_dependency.yml
+++ b/eng/pipelines/templates/steps/analyze_dependency.yml
@@ -1,6 +1,7 @@
 steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python $(PythonVersion)'
+    condition: succeededOrFailed()
     inputs:
      versionSpec: '$(PythonVersion)'
 
@@ -8,14 +9,17 @@ steps:
      pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })
      ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
     displayName: 'Verify Readmes'
+    condition: succeededOrFailed()
 
   - 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'
+    condition: succeededOrFailed()
 
   - task: PythonScript@0
     displayName: 'Analyze dependencies'
+    condition: succeededOrFailed()
     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 e73a549d8a4e5f25f8596a0ff0ef265135301f16 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 28 Apr 2021 12:28:14 -0700
Subject: [PATCH 3/4] accidentally removed Find Invalid Versions

---
 eng/pipelines/templates/steps/analyze.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index cb022d2e5a15..fcd1ec82fe0e 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -33,6 +33,18 @@ steps:
     # (https://github.com/Azure/azure-sdk-for-python/issues/8697)
 
 
+  - pwsh: |
+     pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })
+    displayName: 'Install Necessary Dependencies'
+    condition: succeededOrFailed()
+
+  - script: |
+      cd eng/versioning
+      pip install -r requirements.txt
+      python find_invalid_versions.py --always-succeed --service=${{parameters.ServiceDirectory}}
+    displayName: Find Invalid Versions
+    condition: succeededOrFailed()
+
   - pwsh: |
       Get-ChildItem $(Build.SourcesDirectory) -Filter "*.py" |
       Foreach-Object {
@@ -59,12 +71,6 @@ steps:
     condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
     displayName: 'Component Detection'
 
-  - pwsh: |
-     pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })
-     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
-    displayName: 'Install Necessary Dependencies'
-    condition: succeededOrFailed()
-
   - task: PythonScript@0
     displayName: 'Verify sdist'
     condition: and(succeededOrFailed(), ne(variables['Skip.VerifySdist'],'true'))

From bffe7914753dc349c3438730a7447433e5bac904 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 28 Apr 2021 12:28:44 -0700
Subject: [PATCH 4/4] remove extraneous tab

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

diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index f800b08ad022..f24dd9e67487 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -91,7 +91,7 @@ jobs:
         ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
           Directory: sdk/${{ parameters.ServiceDirectory }}
         CheckLinkGuidance: $true
-        
+
     - template: ../steps/analyze.yml
       parameters:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}