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.

Sign up for GitHub

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

Change from master to main for pipeline generation. #1572

Merged
9 commits merged into from
Apr 30, 2021
Merged

Change from master to main for pipeline generation. #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3135080
Change from master to main for pipeline generation.
mitchdenny Apr 22, 2021
a7ae7a8
Update prepare pipelines template.
mitchdenny Apr 22, 2021
b2dc657
Use default branch template.
mitchdenny Apr 27, 2021
5f49064
Update prepare-pipelines as well.
mitchdenny Apr 27, 2021
2706e9c
Checkout default branch for this pipeline generation approach.
mitchdenny Apr 27, 2021
5a92ae8
Don't need checkout.
mitchdenny Apr 27, 2021
23e2ba0
Remove default line.
mitchdenny Apr 27, 2021
38c1266
Remove CD operation.
mitchdenny Apr 27, 2021
08c583d
Remove designer file.
mitchdenny Apr 28, 2021
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
14 changes: 7 additions & 7 deletions eng/common/pipelines/templates/steps/prepare-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parameters:

steps:
- template: install-pipeline-generation.yml

- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
# This covers our public repos.
- ${{ if not(endsWith(parameters.Repository, '-pr'))}}:
- script: >
Expand All @@ -30,7 +30,7 @@ steps:
--repository ${{parameters.Repository}}
--convention ci
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
${{parameters.CIConventionOptions}}
Expand All @@ -48,7 +48,7 @@ steps:
--repository ${{parameters.Repository}}
--convention up
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
${{parameters.UPConventionOptions}}
Expand All @@ -66,7 +66,7 @@ steps:
--repository ${{parameters.Repository}}
--convention tests
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
${{parameters.TestsConventionOptions}}
Expand All @@ -88,7 +88,7 @@ steps:
--repository ${{parameters.Repository}}
--convention ci
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
--no-schedule
Expand All @@ -107,7 +107,7 @@ steps:
--repository ${{parameters.Repository}}
--convention up
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
--no-schedule
Expand All @@ -126,7 +126,7 @@ steps:
--repository ${{parameters.Repository}}
--convention tests
--agentpool Hosted
--branch refs/heads/master
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
--no-schedule
Expand Down
19 changes: 7 additions & 12 deletions eng/pipelines/pipeline-generation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
matrix:
Java:
RepositoryName: azure-sdk-for-java
Branch: master
Prefix: java
PublicOptions: ''
InternalOptions: >-
Expand All @@ -45,7 +44,6 @@ jobs:
TestOptions: '--variablegroup ${{ parameters.Secrets_for_Resource_Provisioner }}'
Android:
RepositoryName: azure-sdk-for-android
Branch: master
Prefix: android
PublicOptions: ''
InternalOptions: >-
Expand All @@ -56,7 +54,6 @@ jobs:
--variablegroup ${{ parameters.APIReview_AutoCreate_Configurations }}
JavaScript:
RepositoryName: azure-sdk-for-js
Branch: master
Prefix: js
PublicOptions: ''
InternalOptions: >-
Expand All @@ -68,7 +65,6 @@ jobs:
TestOptions: '--variablegroup ${{ parameters.Secrets_for_Resource_Provisioner }}'
Python:
RepositoryName: azure-sdk-for-python
Branch: master
Prefix: python
PublicOptions: ''
InternalOptions: >-
Expand All @@ -79,7 +75,6 @@ jobs:
TestOptions: '--variablegroup ${{ parameters.Secrets_for_Resource_Provisioner }}'
Net:
RepositoryName: azure-sdk-for-net
Branch: master
Prefix: net
PublicOptions: ''
InternalOptions: >-
Expand All @@ -91,7 +86,6 @@ jobs:
TestOptions: '--variablegroup ${{ parameters.Secrets_for_Resource_Provisioner }}'
Cpp:
RepositoryName: azure-sdk-for-cpp
Branch: master
Prefix: cpp
PublicOptions: ''
# Resource Provisioner is in InternalOptions and not TestOptions becasue C++ includes live tests in the unified pipelines
Expand All @@ -105,28 +99,29 @@ jobs:
- template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml
- script: |
git clone https://github.com/azure/$(RepositoryName) $(Pipeline.Workspace)/$(RepositoryName)
cd $(Pipeline.Workspace)/$(RepositoryName)
git checkout $(Branch)
displayName: 'Clone repository: $(RepositoryName)'
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
parameters:
WorkingDirectory: $(Pipeline.Workspace)/$(RepositoryName)
- script: |
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project public --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention ci --agentpool Hosted --branch refs/heads/$(Branch) --patvar PATVAR --debug $(PublicOptions)
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project public --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention ci --agentpool Hosted --branch refs/heads/$(DefaultBranch) --patvar PATVAR --debug $(PublicOptions)
displayName: 'Generate public pipelines for: $(RepositoryName)'
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
- script: |
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention up --agentpool Hosted --branch refs/heads/$(Branch) --patvar PATVAR --debug $(InternalOptions) $(TestOptions)
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention up --agentpool Hosted --branch refs/heads/$(DefaultBranch) --patvar PATVAR --debug $(InternalOptions) $(TestOptions)
displayName: 'Generate internal pipelines for: $(RepositoryName)'
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
- script: |
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention tests --agentpool Hosted --branch refs/heads/$(Branch) --patvar PATVAR --debug $(TestOptions)
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix) --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName) --convention tests --agentpool Hosted --branch refs/heads/$(DefaultBranch) --patvar PATVAR --debug $(TestOptions)
displayName: 'Generate test pipelines for: $(RepositoryName)'
condition: ne(variables['TestOptions'],'')
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)

# - script: |
# pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix)-pr --devopspath "\$(Prefix)\pr" --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName)-pr --convention ci --agentpool Hosted --branch refs/heads/ $(Branch) --patvar PATVAR --debug
# pipeline-generator --organization https://dev.azure.com/azure-sdk --project internal --prefix $(Prefix)-pr --devopspath "\$(Prefix)\pr" --path $(Pipeline.Workspace)/$(RepositoryName)/sdk --endpoint Azure --repository Azure/$(RepositoryName)-pr --convention ci --agentpool Hosted --branch refs/heads/ $(DefaultBranch) --patvar PATVAR --debug
# displayName: 'Generate internal pipelines for: $(RepositoryName)-pr'
# env:
# PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)