Remove Unneeded Reference to repository resource (Azure#11929)

* Remove uneeded reference to repository resource * Refactor CI.yml. * Fix OSName variable overwrite
NVolcz · Jun 18, 2020 · c01658b · c01658b
1 parent 9dc54e9
commit c01658b
Show file tree

Hide file tree

Showing 116 changed files with 345 additions and 1,444 deletions.
diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
@@ -1,13 +1,3 @@
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-    - repository: azure-sdk-build-tools
-      type: git
-      name: internal/azure-sdk-build-tools
-
 trigger: none
 pr: none
 

diff --git a/eng/pipelines/create-doc-index.yml b/eng/pipelines/create-doc-index.yml
@@ -1,12 +1,5 @@
 trigger: none
 
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-
 variables:
   PythonVersion: '3.6'
 
@@ -27,7 +20,7 @@ jobs:
         inputs:
           versionSpec: $(PythonVersion)
 
-      - template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
+      - template: /eng/common/pipelines/templates/steps/replace-relative-links.yml
         parameters:
           TargetFolder: '.'
           RootFolder: '.'

diff --git a/eng/pipelines/generate-all-docs.yml b/eng/pipelines/generate-all-docs.yml
@@ -1,12 +1,5 @@
 trigger: none
 
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-
 variables:
   PythonVersion: '3.6'
 

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -9,37 +9,31 @@ parameters:
   BuildDocs: true
   TestMatrix:
     Linux_Python27:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '2.7'
       CoverageArg: ''
       RunForPR: true
     Linux_Python35:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: false
     Linux_Python38:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
       CoverageArg: ''
       RunForPR: true
     Windows_Python35:
-      OSName: 'Windows'
       OSVmImage: 'windows-2019'
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: true
     MacOS_Python27:
-      OSName: 'MacOS'
       OSVmImage: 'macOS-10.15'
       PythonVersion: '2.7'
       CoverageArg: ''
       RunForPR: false
     Linux_pypy3:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
       CoverageArg: '--disablecov'
@@ -117,7 +111,7 @@ jobs:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         TestMarkArgument: ${{ parameters.TestMarkArgument }}
         AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"'
-        OSName: $(OSName)
+        OSVmImage: $(OSVmImage)
         CoverageArg: $(CoverageArg)
         PythonVersion: $(PythonVersion)
         BuildTargetingString: ${{ parameters.BuildTargetingString }}

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -14,23 +14,18 @@ parameters:
   TestTimeoutInMinutes: 120
   Matrix:
     Linux_Python35:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
     MacOs_Python37:
-      OSName: 'MacOS'
       OSVmImage: 'macOS-10.15'
       PythonVersion: '3.7'
     Windows_Python27:
-      OSName: 'Windows'
       OSVmImage: 'windows-2019'
       PythonVersion: '2.7'
     Linux_PyPy3:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
     Linux_Python38:
-      OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
 
@@ -78,7 +73,7 @@ jobs:
           BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
           AfterTestSteps: ${{ parameters.AfterTestSteps }}
           PythonVersion: $(PythonVersion)
-          OSName: $(OSName)
+          OSVmImage: $(OSVmImage)
           ToxTestEnv: "whl"
           AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
           TestMarkArgument: ${{ parameters.TestMarkArgument }}

diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -1,12 +1,38 @@
+resources:
+  repositories:
+    - repository: azure-sdk-tools
+      type: github
+      name: azure/azure-sdk-tools
+      endpoint: azure
+      ref: refs/tags/azure-sdk-tools_20200608.1
+    - repository: azure-sdk-build-tools
+      type: git
+      name: internal/azure-sdk-build-tools
+      ref: refs/tags/azure-sdk-build-tools_20200514.1
+
 parameters:
-  Artifacts: []
-  ServiceDirectory: not-specified
-  ToxEnvParallel: '--tenvparallel'
-  InjectedPackages: ''
-  BuildDocs: true
-  TargetDocRepoOwner: 'MicrosoftDocs'
-  TargetDocRepoName: 'azure-docs-sdk-python'
-
+- name: Artifacts
+  type: object
+  default: []
+- name: ServiceDirectory
+  type: string
+  default: not-specified
+- name: ToxEnvParallel
+  type: string
+  default: --tenvparallel
+- name: InjectedPackages
+  type: string
+  default: ''
+- name: BuildDocs
+  type: boolean
+  default: true
+- name: TargetDocRepoOwner
+  type: string
+  default: MicrosoftDocs
+- name: TargetDocRepoName
+  type: string
+  default: azure-docs-sdk-python
+
 stages:
   - stage: Build
     jobs:

diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -1,10 +1,34 @@
+resources:
+  repositories:
+    - repository: azure-sdk-tools
+      type: github
+      name: azure/azure-sdk-tools
+      endpoint: azure
+      ref: refs/tags/azure-sdk-tools_20200608.1
+    - repository: azure-sdk-build-tools
+      type: git
+      name: internal/azure-sdk-build-tools
+      ref: refs/tags/azure-sdk-build-tools_20200514.1
+
 parameters:
-  Artifacts: []
-  ServiceDirectory: not-specified
-  EmulatorMsiUrl: 'https://aka.ms/cosmosdb-emulator'
-  EmulatorStartParameters: ''
-  InjectedPackages: ''
-  BuildDocs: true
+- name: Artifacts
+  type: object
+  default: []
+- name: ServiceDirectory
+  type: string
+  default: not-specified
+- name: EmulatorMsiUrl
+  type: string
+  default: https://aka.ms/cosmosdb-emulator
+- name: InjectedPackages
+  type: string
+  default: ''
+- name: BuildDocs
+  type: boolean
+  default: true
+- name: EmulatorStartParameters
+  type: string
+  default: ''
 
 stages:
   - stage: Build
@@ -21,11 +45,9 @@ stages:
           matrix:
             Windows_Python35:
               OSVmImage: 'windows-2019'
-              OSName: Windows
               PythonVersion: '3.5'
             Windows_Python27:
               OSVmImage: 'windows-2019'
-              OSName: Windows
               PythonVersion: '2.7'
         pool:
           vmImage: $(OSVmImage)
@@ -43,14 +65,14 @@ stages:
                 ACCOUNT_HOST: https://localhost:8081/
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
               PythonVersion: $(PythonVersion)
-              OSName: $(OSName)
+              OSVmImage: $(OSVmImage)
               ToxTestEnv: 'whl,sdist'
               BuildDocs: ${{parameters.BuildDocs}}
               InjectedPackages: ${{parameters.InjectedPackages}}
 
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
-    - template: pipelines/stages/archetype-python-release.yml@azure-sdk-build-tools
+    - template: archetype-python-release.yml
       parameters:
         DependsOn: Build
         ServiceDirectory: ${{parameters.ServiceDirectory}}

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
@@ -41,7 +41,7 @@ steps:
       python find_invalid_versions.py --always-succeed --service=${{parameters.ServiceDirectory}}
     displayName: Find Invalid Versions
 
-  - template: eng/pipelines/templates/scripts/verify-path-length.yml@azure-sdk-tools
+  - template: /eng/common/pipelines/templates/steps/verify-path-length.yml
     parameters:
       SourceDirectory: $(Build.SourcesDirectory)
 

diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml
@@ -19,7 +19,7 @@ steps:
       pip install -r eng/ci_tools.txt
     displayName: 'Prep Py2 Environment'
     
-  - template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
+  - template: /eng/common/pipelines/templates/steps/replace-relative-links.yml
     parameters:
       TargetFolder: $(Build.SourcesDirectory)
       RootFolder: $(Build.SourcesDirectory)

diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
@@ -4,7 +4,7 @@ parameters:
   EnvVars: {}
   ServiceDirectory: ''
   PythonVersion: ''
-  OSName: ''
+  OSVmImage: ''
   BeforeTestSteps: []
   AfterTestSteps: []
   CoverageArg: ''
@@ -23,9 +23,7 @@ steps:
     inputs:
       versionSpec: '${{ parameters.PythonVersion }}'
 
-  - template: eng/pipelines/templates/scripts/verify-agent-os.yml@azure-sdk-tools
-    parameters:
-      OSName: ${{ parameters.OSName }}
+  - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
 
   - script: |
       python -m pip install pip == 20.1
@@ -56,7 +54,7 @@ steps:
     condition: always()
     inputs:
       testResultsFiles: '**/*test*.xml'
-      testRunTitle: '${{ parameters.OSName }} Python ${{ parameters.PythonVersion }}'
+      testRunTitle: '$(OSName) Python ${{ parameters.PythonVersion }}'
       failTaskOnFailedTests: true
 
   - template: publish-coverage.yml

diff --git a/eng/pipelines/test-all.yml b/eng/pipelines/test-all.yml
@@ -1,13 +1,3 @@
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-    - repository: azure-sdk-build-tools
-      type: git
-      name: internal/azure-sdk-build-tools
-
 trigger: none
 pr: none
 

diff --git a/sdk/advisor/ci.yml b/sdk/advisor/ci.yml
@@ -1,16 +1,6 @@
 # DO NOT EDIT THIS FILE
 # This file is generated automatically and any changes will be lost.
 
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-    - repository: azure-sdk-build-tools
-      type: git
-      name: internal/azure-sdk-build-tools
-
 trigger:
   branches:
     include:
@@ -34,11 +24,10 @@ pr:
     include:
     - sdk/advisor/
 
-
-stages:
-- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+extends:
+  template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: advisor
     Artifacts:
     - name: azure_mgmt_advisor
-      safeName: azuremgmtadvisor
+      safeName: azuremgmtadvisor
diff --git a/sdk/aks/ci.yml b/sdk/aks/ci.yml
@@ -1,16 +1,6 @@
 # DO NOT EDIT THIS FILE
 # This file is generated automatically and any changes will be lost.
 
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-    - repository: azure-sdk-build-tools
-      type: git
-      name: internal/azure-sdk-build-tools
-
 trigger:
   branches:
     include:
@@ -34,11 +24,10 @@ pr:
     include:
     - sdk/aks/
 
-
-stages:
-- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+extends:
+  template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: aks
     Artifacts:
     - name: azure_mgmt_devspaces
-      safeName: azuremgmtdevspaces
+      safeName: azuremgmtdevspaces