Skip to content

Commit

Permalink
Allow Custom Pre-Installs During a Manual Build (#9533)
Browse files Browse the repository at this point in the history
* adjustments to allow an argument w/ additional packages in it
* adding a wrapper ci.yml that can be invoked against the entire repo
* passing around a BuildDocs param. this means that the test-all can pass 'no docs' but the default will still generate them
* deleting the nightly build ymls. with some clever parametering we don't need them anymore!
  • Loading branch information
scbedd committed Jan 25, 2020
1 parent ba172f3 commit 2804325
Show file tree
Hide file tree
Showing 16 changed files with 117 additions and 245 deletions.
4 changes: 4 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Expand Up @@ -5,6 +5,8 @@ parameters:
BuildTargetingString: 'azure-*'
TestTimeoutInMinutes: 0
ToxEnvParallel: '--tenvparallel'
InjectedPackages: ''
BuildDocs: true
TestMatrix:
Linux_Python27:
OSName: 'Linux'
Expand Down Expand Up @@ -70,6 +72,7 @@ jobs:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
BuildTargetingString: ${{ parameters.BuildTargetingString }}
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
BuildDocs: ${{ parameters.BuildDocs }}

- job: 'Analyze'
condition: and(succeededOrFailed(), ne(variables['Skip.Analyze'], 'true'))
Expand Down Expand Up @@ -131,6 +134,7 @@ jobs:
BuildTargetingString: ${{ parameters.BuildTargetingString }}
ToxTestEnv: $(toxenv)
ToxEnvParallel: ${{ parameters.ToxEnvParallel }}
InjectedPackages: ${{ parameters.InjectedPackages }}
BeforeTestSteps:
- task: DownloadPipelineArtifact@0
inputs:
Expand Down
107 changes: 0 additions & 107 deletions eng/pipelines/templates/jobs/archetype-sdk-nightly.yml

This file was deleted.

4 changes: 4 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
Expand Up @@ -6,6 +6,8 @@ parameters:
BuildTargetingString: 'azure-*'
AdditionalTestArgs: ''
TestMarkArgument: ''
InjectedPackages: ''
BuildDocs: true
JobName: Test
Matrix:
Linux_Python35:
Expand Down Expand Up @@ -59,4 +61,6 @@ jobs:
ToxTestEnv: "whl"
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
TestMarkArgument: ${{ parameters.TestMarkArgument }}
InjectedPackages: ${{ parameters.InjectedPackages }}
BuildDocs: ${{parameters.BuildDocs}}

5 changes: 5 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Expand Up @@ -2,6 +2,9 @@ parameters:
Artifacts: []
ServiceDirectory: not-specified
ToxEnvParallel: '--tenvparallel'
InjectedPackages: ''
BuildDocs: true


stages:
- stage: Build
Expand All @@ -10,6 +13,8 @@ stages:
parameters:
ServiceDirectory: ${{parameters.ServiceDirectory}}
ToxEnvParallel: ${{parameters.ToxEnvParallel}}
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'))}}:
Expand Down
7 changes: 6 additions & 1 deletion eng/pipelines/templates/stages/cosmos-sdk-client.yml
Expand Up @@ -3,6 +3,8 @@ parameters:
ServiceDirectory: not-specified
EmulatorMsiUrl: 'https://aka.ms/cosmosdb-emulator'
EmulatorStartParameters: ''
InjectedPackages: ''
BuildDocs: true

stages:
- stage: Build
Expand All @@ -12,7 +14,8 @@ stages:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
# Skip emulator tests in the CI run
TestMarkArgument: not cosmosEmulator

BuildDocs: ${{parameters.BuildDocs}}
InjectedPackages: ${{parameters.InjectedPackages}}
- job: Emulator
strategy:
matrix:
Expand Down Expand Up @@ -42,6 +45,8 @@ stages:
PythonVersion: $(PythonVersion)
OSName: $(OSName)
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'))}}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/analyze.yml
Expand Up @@ -32,7 +32,7 @@ steps:
- script: |
cd eng/versioning
pip install -r requirements.txt
python find_invalid_versions.py --always-succeed --service ${{parameters.ServiceDirectory}}
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
Expand Down
4 changes: 3 additions & 1 deletion eng/pipelines/templates/steps/build-artifacts.yml
Expand Up @@ -2,6 +2,7 @@ parameters:
BeforePublishSteps: []
BuildTargetingString: 'azure-*'
ServiceDirectory: ''
BuildDocs: true

steps:
- script: |
Expand Down Expand Up @@ -57,6 +58,7 @@ steps:
- task: PythonScript@0
displayName: 'Generate Docs'
condition: and(succeededOrFailed(), ${{parameters.BuildDocs}})
inputs:
scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
arguments: >-
Expand All @@ -79,7 +81,7 @@ steps:
artifact: packages

- task: PublishBuildArtifacts@1
condition: succeededOrFailed()
condition: and(succeededOrFailed(), ${{parameters.BuildDocs}})
displayName: 'Publish Artifacts'
inputs:
artifactName: 'documentation'
Expand Down
57 changes: 0 additions & 57 deletions eng/pipelines/templates/steps/build-package-artifacts.yml

This file was deleted.

2 changes: 2 additions & 0 deletions eng/pipelines/templates/steps/build-test.yml
Expand Up @@ -11,6 +11,7 @@ parameters:
ToxTestEnv: ""
RunCoverage: ne(variables['CoverageArg'], '--disablecov')
ToxEnvParallel: ''
InjectedPackages: ''

steps:
- pwsh: |
Expand Down Expand Up @@ -42,6 +43,7 @@ steps:
--mark_arg="${{ parameters.TestMarkArgument }}"
--service="${{ parameters.ServiceDirectory }}"
--toxenv="${{ parameters.ToxTestEnv }}"
--injected-packages="${{ parameters.InjectedPackages }}"
${{ parameters.ToxEnvParallel }}
env: ${{ parameters.EnvVars }}

Expand Down
75 changes: 0 additions & 75 deletions eng/pipelines/templates/steps/test-nightly.yml

This file was deleted.

0 comments on commit 2804325

Please sign in to comment.