Skip to content

Commit c01658b

Browse files
chidozieononiwuchidozieononiwu
authored
Remove Unneeded Reference to repository resource (#11929)
* Remove uneeded reference to repository resource * Refactor CI.yml. * Fix OSName variable overwrite
1 parent 9dc54e9 commit c01658b

File tree

116 files changed

+345
-1444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+345
-1444
lines changed

‎eng/pipelines/aggregate-reports.yml

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
resources:
2-
repositories:
3-
- repository: azure-sdk-tools
4-
type: github
5-
name: Azure/azure-sdk-tools
6-
endpoint: azure
7-
- repository: azure-sdk-build-tools
8-
type: git
9-
name: internal/azure-sdk-build-tools
10-
111
trigger: none
122
pr: none
133

‎eng/pipelines/create-doc-index.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
trigger: none
22

3-
resources:
4-
repositories:
5-
- repository: azure-sdk-tools
6-
type: github
7-
name: Azure/azure-sdk-tools
8-
endpoint: azure
9-
103
variables:
114
PythonVersion: '3.6'
125

@@ -27,7 +20,7 @@ jobs:
2720
inputs:
2821
versionSpec: $(PythonVersion)
2922

30-
- template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
23+
- template: /eng/common/pipelines/templates/steps/replace-relative-links.yml
3124
parameters:
3225
TargetFolder: '.'
3326
RootFolder: '.'

‎eng/pipelines/generate-all-docs.yml

-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
trigger: none
22

3-
resources:
4-
repositories:
5-
- repository: azure-sdk-tools
6-
type: github
7-
name: Azure/azure-sdk-tools
8-
endpoint: azure
9-
103
variables:
114
PythonVersion: '3.6'
125

‎eng/pipelines/templates/jobs/archetype-sdk-client.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,31 @@ parameters:
99
BuildDocs: true
1010
TestMatrix:
1111
Linux_Python27:
12-
OSName: 'Linux'
1312
OSVmImage: 'ubuntu-18.04'
1413
PythonVersion: '2.7'
1514
CoverageArg: ''
1615
RunForPR: true
1716
Linux_Python35:
18-
OSName: 'Linux'
1917
OSVmImage: 'ubuntu-18.04'
2018
PythonVersion: '3.5'
2119
CoverageArg: ''
2220
RunForPR: false
2321
Linux_Python38:
24-
OSName: 'Linux'
2522
OSVmImage: 'ubuntu-18.04'
2623
PythonVersion: '3.8'
2724
CoverageArg: ''
2825
RunForPR: true
2926
Windows_Python35:
30-
OSName: 'Windows'
3127
OSVmImage: 'windows-2019'
3228
PythonVersion: '3.5'
3329
CoverageArg: ''
3430
RunForPR: true
3531
MacOS_Python27:
36-
OSName: 'MacOS'
3732
OSVmImage: 'macOS-10.15'
3833
PythonVersion: '2.7'
3934
CoverageArg: ''
4035
RunForPR: false
4136
Linux_pypy3:
42-
OSName: 'Linux'
4337
OSVmImage: 'ubuntu-18.04'
4438
PythonVersion: 'pypy3'
4539
CoverageArg: '--disablecov'
@@ -117,7 +111,7 @@ jobs:
117111
ServiceDirectory: ${{ parameters.ServiceDirectory }}
118112
TestMarkArgument: ${{ parameters.TestMarkArgument }}
119113
AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"'
120-
OSName: $(OSName)
114+
OSVmImage: $(OSVmImage)
121115
CoverageArg: $(CoverageArg)
122116
PythonVersion: $(PythonVersion)
123117
BuildTargetingString: ${{ parameters.BuildTargetingString }}

‎eng/pipelines/templates/jobs/archetype-sdk-tests.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,18 @@ parameters:
1414
TestTimeoutInMinutes: 120
1515
Matrix:
1616
Linux_Python35:
17-
OSName: 'Linux'
1817
OSVmImage: 'ubuntu-18.04'
1918
PythonVersion: '3.5'
2019
MacOs_Python37:
21-
OSName: 'MacOS'
2220
OSVmImage: 'macOS-10.15'
2321
PythonVersion: '3.7'
2422
Windows_Python27:
25-
OSName: 'Windows'
2623
OSVmImage: 'windows-2019'
2724
PythonVersion: '2.7'
2825
Linux_PyPy3:
29-
OSName: 'Linux'
3026
OSVmImage: 'ubuntu-18.04'
3127
PythonVersion: 'pypy3'
3228
Linux_Python38:
33-
OSName: 'Linux'
3429
OSVmImage: 'ubuntu-18.04'
3530
PythonVersion: '3.8'
3631

@@ -78,7 +73,7 @@ jobs:
7873
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
7974
AfterTestSteps: ${{ parameters.AfterTestSteps }}
8075
PythonVersion: $(PythonVersion)
81-
OSName: $(OSName)
76+
OSVmImage: $(OSVmImage)
8277
ToxTestEnv: "whl"
8378
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
8479
TestMarkArgument: ${{ parameters.TestMarkArgument }}

‎eng/pipelines/templates/stages/archetype-sdk-client.yml

+34-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,38 @@
1+
resources:
2+
repositories:
3+
- repository: azure-sdk-tools
4+
type: github
5+
name: azure/azure-sdk-tools
6+
endpoint: azure
7+
ref: refs/tags/azure-sdk-tools_20200608.1
8+
- repository: azure-sdk-build-tools
9+
type: git
10+
name: internal/azure-sdk-build-tools
11+
ref: refs/tags/azure-sdk-build-tools_20200514.1
12+
113
parameters:
2-
Artifacts: []
3-
ServiceDirectory: not-specified
4-
ToxEnvParallel: '--tenvparallel'
5-
InjectedPackages: ''
6-
BuildDocs: true
7-
TargetDocRepoOwner: 'MicrosoftDocs'
8-
TargetDocRepoName: 'azure-docs-sdk-python'
9-
14+
- name: Artifacts
15+
type: object
16+
default: []
17+
- name: ServiceDirectory
18+
type: string
19+
default: not-specified
20+
- name: ToxEnvParallel
21+
type: string
22+
default: --tenvparallel
23+
- name: InjectedPackages
24+
type: string
25+
default: ''
26+
- name: BuildDocs
27+
type: boolean
28+
default: true
29+
- name: TargetDocRepoOwner
30+
type: string
31+
default: MicrosoftDocs
32+
- name: TargetDocRepoName
33+
type: string
34+
default: azure-docs-sdk-python
35+
1036
stages:
1137
- stage: Build
1238
jobs:

‎eng/pipelines/templates/stages/cosmos-sdk-client.yml

+32-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
1+
resources:
2+
repositories:
3+
- repository: azure-sdk-tools
4+
type: github
5+
name: azure/azure-sdk-tools
6+
endpoint: azure
7+
ref: refs/tags/azure-sdk-tools_20200608.1
8+
- repository: azure-sdk-build-tools
9+
type: git
10+
name: internal/azure-sdk-build-tools
11+
ref: refs/tags/azure-sdk-build-tools_20200514.1
12+
113
parameters:
2-
Artifacts: []
3-
ServiceDirectory: not-specified
4-
EmulatorMsiUrl: 'https://aka.ms/cosmosdb-emulator'
5-
EmulatorStartParameters: ''
6-
InjectedPackages: ''
7-
BuildDocs: true
14+
- name: Artifacts
15+
type: object
16+
default: []
17+
- name: ServiceDirectory
18+
type: string
19+
default: not-specified
20+
- name: EmulatorMsiUrl
21+
type: string
22+
default: https://aka.ms/cosmosdb-emulator
23+
- name: InjectedPackages
24+
type: string
25+
default: ''
26+
- name: BuildDocs
27+
type: boolean
28+
default: true
29+
- name: EmulatorStartParameters
30+
type: string
31+
default: ''
832

933
stages:
1034
- stage: Build
@@ -21,11 +45,9 @@ stages:
2145
matrix:
2246
Windows_Python35:
2347
OSVmImage: 'windows-2019'
24-
OSName: Windows
2548
PythonVersion: '3.5'
2649
Windows_Python27:
2750
OSVmImage: 'windows-2019'
28-
OSName: Windows
2951
PythonVersion: '2.7'
3052
pool:
3153
vmImage: $(OSVmImage)
@@ -43,14 +65,14 @@ stages:
4365
ACCOUNT_HOST: https://localhost:8081/
4466
ServiceDirectory: ${{ parameters.ServiceDirectory }}
4567
PythonVersion: $(PythonVersion)
46-
OSName: $(OSName)
68+
OSVmImage: $(OSVmImage)
4769
ToxTestEnv: 'whl,sdist'
4870
BuildDocs: ${{parameters.BuildDocs}}
4971
InjectedPackages: ${{parameters.InjectedPackages}}
5072

5173
# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
5274
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
53-
- template: pipelines/stages/archetype-python-release.yml@azure-sdk-build-tools
75+
- template: archetype-python-release.yml
5476
parameters:
5577
DependsOn: Build
5678
ServiceDirectory: ${{parameters.ServiceDirectory}}

‎eng/pipelines/templates/steps/analyze.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
python find_invalid_versions.py --always-succeed --service=${{parameters.ServiceDirectory}}
4242
displayName: Find Invalid Versions
4343
44-
- template: eng/pipelines/templates/scripts/verify-path-length.yml@azure-sdk-tools
44+
- template: /eng/common/pipelines/templates/steps/verify-path-length.yml
4545
parameters:
4646
SourceDirectory: $(Build.SourcesDirectory)
4747

‎eng/pipelines/templates/steps/build-artifacts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
pip install -r eng/ci_tools.txt
2020
displayName: 'Prep Py2 Environment'
2121
22-
- template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
22+
- template: /eng/common/pipelines/templates/steps/replace-relative-links.yml
2323
parameters:
2424
TargetFolder: $(Build.SourcesDirectory)
2525
RootFolder: $(Build.SourcesDirectory)

‎eng/pipelines/templates/steps/build-test.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
EnvVars: {}
55
ServiceDirectory: ''
66
PythonVersion: ''
7-
OSName: ''
7+
OSVmImage: ''
88
BeforeTestSteps: []
99
AfterTestSteps: []
1010
CoverageArg: ''
@@ -23,9 +23,7 @@ steps:
2323
inputs:
2424
versionSpec: '${{ parameters.PythonVersion }}'
2525

26-
- template: eng/pipelines/templates/scripts/verify-agent-os.yml@azure-sdk-tools
27-
parameters:
28-
OSName: ${{ parameters.OSName }}
26+
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
2927

3028
- script: |
3129
python -m pip install pip == 20.1
@@ -56,7 +54,7 @@ steps:
5654
condition: always()
5755
inputs:
5856
testResultsFiles: '**/*test*.xml'
59-
testRunTitle: '${{ parameters.OSName }} Python ${{ parameters.PythonVersion }}'
57+
testRunTitle: '$(OSName) Python ${{ parameters.PythonVersion }}'
6058
failTaskOnFailedTests: true
6159

6260
- template: publish-coverage.yml

‎eng/pipelines/test-all.yml

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
resources:
2-
repositories:
3-
- repository: azure-sdk-tools
4-
type: github
5-
name: Azure/azure-sdk-tools
6-
endpoint: azure
7-
- repository: azure-sdk-build-tools
8-
type: git
9-
name: internal/azure-sdk-build-tools
10-
111
trigger: none
122
pr: none
133

‎sdk/advisor/ci.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
# DO NOT EDIT THIS FILE
22
# This file is generated automatically and any changes will be lost.
33

4-
resources:
5-
repositories:
6-
- repository: azure-sdk-tools
7-
type: github
8-
name: Azure/azure-sdk-tools
9-
endpoint: azure
10-
- repository: azure-sdk-build-tools
11-
type: git
12-
name: internal/azure-sdk-build-tools
13-
144
trigger:
155
branches:
166
include:
@@ -34,11 +24,10 @@ pr:
3424
include:
3525
- sdk/advisor/
3626

37-
38-
stages:
39-
- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
27+
extends:
28+
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
4029
parameters:
4130
ServiceDirectory: advisor
4231
Artifacts:
4332
- name: azure_mgmt_advisor
44-
safeName: azuremgmtadvisor
33+
safeName: azuremgmtadvisor

‎sdk/aks/ci.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
# DO NOT EDIT THIS FILE
22
# This file is generated automatically and any changes will be lost.
33

4-
resources:
5-
repositories:
6-
- repository: azure-sdk-tools
7-
type: github
8-
name: Azure/azure-sdk-tools
9-
endpoint: azure
10-
- repository: azure-sdk-build-tools
11-
type: git
12-
name: internal/azure-sdk-build-tools
13-
144
trigger:
155
branches:
166
include:
@@ -34,11 +24,10 @@ pr:
3424
include:
3525
- sdk/aks/
3626

37-
38-
stages:
39-
- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
27+
extends:
28+
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
4029
parameters:
4130
ServiceDirectory: aks
4231
Artifacts:
4332
- name: azure_mgmt_devspaces
44-
safeName: azuremgmtdevspaces
33+
safeName: azuremgmtdevspaces

0 commit comments

Comments
 (0)