From a572caf8e328a0668676355e9fa44e486d84657f Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 19 May 2020 17:59:06 -0700 Subject: [PATCH 1/3] reduce build matrix. remove 3.6 and 3.7. move pylint and mypy into analyze step --- .../templates/jobs/archetype-sdk-client.yml | 51 +------------------ eng/pipelines/templates/steps/analyze.yml | 17 ++++++- 2 files changed, 17 insertions(+), 51 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index bc102d47af74..cee5e7406355 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -20,18 +20,6 @@ parameters: PythonVersion: '3.5' CoverageArg: '' RunForPR: false - Linux_Python36: - OSName: 'Linux' - OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.6' - CoverageArg: '' - RunForPR: false - Linux_Python37: - OSName: 'Linux' - OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.7' - CoverageArg: '' - RunForPR: false Linux_Python38: OSName: 'Linux' OSVmImage: 'ubuntu-18.04' @@ -90,6 +78,7 @@ jobs: parameters: ServiceDirectory: ${{ parameters.ServiceDirectory }} BuildTargetingString: ${{ parameters.BuildTargetingString }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} - job: 'Test' condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true')) @@ -146,44 +135,6 @@ jobs: ServiceDirectory: ${{ parameters.ServiceDirectory }} BuildTargetingString: ${{ parameters.BuildTargetingString }} - - job: 'RunMyPy' - condition: and(succeededOrFailed(), ne(variables['Skip.MyPy'], 'true')) - displayName: 'Run MyPy' - variables: - - template: ../variables/globals.yml - - dependsOn: - - 'Build' - - pool: - vmImage: 'ubuntu-18.04' - - steps: - - template: ../steps/run_mypy.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} - - - job: 'RunPyLint' - condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'], 'true')) - displayName: 'Run Pylint' - variables: - - template: ../variables/globals.yml - - dependsOn: - - 'Build' - - pool: - vmImage: 'ubuntu-18.04' - - steps: - - template: ../steps/run_pylint.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} - - job: 'RunRegression' condition: and(succeededOrFailed(), or(eq(variables['Run.Regression'], 'true'), and(eq(variables['Build.Reason'], 'Schedule'), eq(variables['System.TeamProject'],'internal')))) displayName: 'Run Regression' diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml index a6b06bc6aef9..166f211e2940 100644 --- a/eng/pipelines/templates/steps/analyze.yml +++ b/eng/pipelines/templates/steps/analyze.yml @@ -1,6 +1,7 @@ parameters: BuildTargetingString: 'azure-*' ServiceDirectory: '' + TestMarkArgument: '' steps: - task: UsePythonVersion@0 @@ -69,4 +70,18 @@ steps: condition: ne(variables['Skip.VerifyWhl'],'true') inputs: scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' - arguments: '"${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl' \ No newline at end of file + arguments: '"${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl' + + - ${{if ne(variables['Skip.MyPy'], 'true')}}: + - template: run_mypy.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + BuildTargetingString: ${{ parameters.BuildTargetingString }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} + + - ${{if ne(variables['Skip.Pylint'], 'true')}}: + - template: ../steps/run_pylint.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + BuildTargetingString: ${{ parameters.BuildTargetingString }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} \ No newline at end of file From 3319e74d395e9e562eee6d7881976adbbbe8ac7b Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 19 May 2020 18:18:46 -0700 Subject: [PATCH 2/3] touch appconfig --- sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt index 7b777172dce0..2a41134e0e0d 100644 --- a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt +++ b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt @@ -5,4 +5,3 @@ aiohttp>=3.0; python_version >= '3.5' aiodns>=2.0; python_version >= '3.5' msrest>=0.6.10 - From 0bdc08bc6405c00529e50d0c782380dd5d107011 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 19 May 2020 18:26:59 -0700 Subject: [PATCH 3/3] respace the optional steps --- eng/pipelines/templates/steps/analyze.yml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml index 166f211e2940..c4e56dc0c2d4 100644 --- a/eng/pipelines/templates/steps/analyze.yml +++ b/eng/pipelines/templates/steps/analyze.yml @@ -72,16 +72,16 @@ steps: scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' arguments: '"${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl' - - ${{if ne(variables['Skip.MyPy'], 'true')}}: - - template: run_mypy.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} + - ${{if ne(variables['Skip.MyPy'], 'true') }}: + - template: run_mypy.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + BuildTargetingString: ${{ parameters.BuildTargetingString }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} - - ${{if ne(variables['Skip.Pylint'], 'true')}}: - - template: ../steps/run_pylint.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} \ No newline at end of file + - ${{if ne(variables['Skip.Pylint'], 'true') }}: + - template: run_pylint.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + BuildTargetingString: ${{ parameters.BuildTargetingString }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} \ No newline at end of file