Skip to content

Move common parts of sdl templates to additional templates#8247

Merged
michellemcdaniel merged 2 commits intodotnet:mainfrom
michellemcdaniel:sdlTemplates
Dec 7, 2021
Merged

Move common parts of sdl templates to additional templates#8247
michellemcdaniel merged 2 commits intodotnet:mainfrom
michellemcdaniel:sdlTemplates

Conversation

@michellemcdaniel
Copy link
Contributor

@michellemcdaniel michellemcdaniel commented Dec 7, 2021

SDL Validation is done in both the repos and the staging/validation pipelines. Today, we have a large amount of the sdl job template duplicated for the staging/validation pipelines because we need to use different sources/we don't need all the artifact downloading (and if we did, we would want to get the artifacts from a different place). This duplication leads to issues like #8243 (among others), where versions changed in arcade, but they weren't properly migrated to dotnet-release, and the validation pipeline started failing.

This change moves the duplicated steps to a steps template, and the duplicated variables to a variables template, so we can more easily share between these repos/pipelines.

To double check:

This was tested in https://dev.azure.com/dnceng/internal/_build/results?buildId=1499177&view=results.

SDL Validation is done in both the repos and the staging/validaiton pipelines. Today, we have a large amount of the sdl job template duplicated for the staging/validation pipelines because we need to use different sources/we don't need all the artifact downloading (and if we did, we would want to get the artifacts from a different place). This duplication leads to issues like dotnet#8243 (among others), where versions changed in arcade, but they weren't properly migrated to dotnet-release, and the validation pipeline started failing.

This change moves the duplicated steps to a steps template, and the duplicated variables to a variables template, so we can more easily share between these repos/pipelines.
@@ -0,0 +1,68 @@
parameters:
overrideGuadianVersion: ''
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
overrideGuadianVersion: ''
overrideGuardianVersion: ''

Copy link
Contributor

@riarenas riarenas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Maybe run an internal arcade build just to check that non-release repo pipelines are fine?

@michellemcdaniel
Copy link
Contributor Author

LGTM, Maybe run an internal arcade build just to check that non-release repo pipelines are fine?

Running now. Good idea. https://dev.azure.com/dnceng/internal/_build/results?buildId=1501387&view=results

@michellemcdaniel
Copy link
Contributor Author

Test succeeded

@michellemcdaniel michellemcdaniel merged commit c5e3d62 into dotnet:main Dec 7, 2021
garath pushed a commit to garath/dotnet-arcade that referenced this pull request Mar 1, 2022
* Move common parts of sdl templates to additional templates

SDL Validation is done in both the repos and the staging/validaiton pipelines. Today, we have a large amount of the sdl job template duplicated for the staging/validation pipelines because we need to use different sources/we don't need all the artifact downloading (and if we did, we would want to get the artifacts from a different place). This duplication leads to issues like dotnet#8243 (among others), where versions changed in arcade, but they weren't properly migrated to dotnet-release, and the validation pipeline started failing.

This change moves the duplicated steps to a steps template, and the duplicated variables to a variables template, so we can more easily share between these repos/pipelines.

* Fix typo
garath added a commit that referenced this pull request Mar 8, 2022
Resolve remaining CodeQL errors.

This also brings in #8247 to get the same template arrangement as the main branch.

Co-authored-by: Michelle McDaniel <michelm@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants