Skip to content
Open
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
28 changes: 16 additions & 12 deletions .azure-pipelines/azure-pipelines-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
inputs:
versionSpec: '3.x'
architecture: 'x64'
- script: pip install setuptools
displayName: 'install setuptools'

- template: templates/setup-ci-machine.yml

Expand All @@ -33,6 +35,8 @@ jobs:
inputs:
versionSpec: '3.x'
architecture: 'x64'
- script: pip install setuptools
displayName: 'install setuptools'

- template: templates/setup-ci-machine.yml

Expand Down Expand Up @@ -79,33 +83,33 @@ jobs:
- job: 'Run_Test_Mac'
dependsOn: ['Build_Publish_Azure_CLI_Test_SDK','Build_Publish_Azure_DevOps_CLI_Extension']
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- template: templates/run-tests.yml
parameters:
pythonVersion: '3.x'
pythonVersion: '3.10'

- job: 'Run_Test_Mac_Azure_CLI_Released_Version'
dependsOn : Build_Publish_Azure_CLI_Test_SDK
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- template: templates/run-tests.yml
parameters:
pythonVersion: '3.x'
pythonVersion: '3.10'
runWithAzureCliReleased: 'true'

- job: 'Code_Coverage'
dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.x'
versionSpec: '3.10'
architecture: 'x64'

- template: templates/install-azure-cli-edge.yml
Expand Down Expand Up @@ -137,12 +141,12 @@ jobs:

- job: 'Run_Style_Check'
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.x'
versionSpec: '3.8'
architecture: 'x64'

- template: templates/install-azure-cli-edge.yml
Expand All @@ -162,12 +166,12 @@ jobs:
- job: 'Run_HelpText_Check'
dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.x'
versionSpec: '3.10'
architecture: 'x64'

- template: templates/install-azure-cli-edge.yml
Expand All @@ -189,14 +193,14 @@ jobs:
- job: 'Run_Test_From_Old_Release'
dependsOn : Build_Publish_Azure_CLI_Test_SDK
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-latest'

steps:
- script: git checkout Releases-0.26.0

- template: templates/run-tests.yml
parameters:
pythonVersion: '3.x'
pythonVersion: '3.10'
runOnlyRecordedTests: 'true'

- job: 'Check_Back_Compat_Arguments'
Expand Down