Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Unneeded Reference to repository resource #11929

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions eng/pipelines/aggregate-reports.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 1 addition & 8 deletions eng/pipelines/create-doc-index.yml
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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: '.'
Expand Down
7 changes: 0 additions & 7 deletions eng/pipelines/generate-all-docs.yml
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
8 changes: 1 addition & 7 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 1 addition & 6 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
chidozieononiwu marked this conversation as resolved.
Show resolved Hide resolved
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.8'

Expand Down Expand Up @@ -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 }}
Expand Down
42 changes: 34 additions & 8 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
resources:
repositories:
- repository: azure-sdk-tools
chidozieononiwu marked this conversation as resolved.
Show resolved Hide resolved
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:
Expand Down
42 changes: 32 additions & 10 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 3 additions & 5 deletions eng/pipelines/templates/steps/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
EnvVars: {}
ServiceDirectory: ''
PythonVersion: ''
OSName: ''
OSVmImage: ''
BeforeTestSteps: []
AfterTestSteps: []
CoverageArg: ''
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions eng/pipelines/test-all.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
17 changes: 3 additions & 14 deletions sdk/advisor/ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
17 changes: 3 additions & 14 deletions sdk/aks/ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Loading