Skip to content

Fix test stage matrix generation #1465

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

Merged
mthalman merged 1 commit into from
Oct 9, 2024
Merged

Fix test stage matrix generation #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions eng/common/templates/jobs/generate-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,10 @@ jobs:
$(commonMatrixAndBuildOptions)
$(additionalGenerateBuildMatrixOptions)"
displayName: Set GenerateBuildMatrix Command
- ${{ if eq(parameters.isTestStage, false) }}:
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
parameters:
name: matrix
displayName: Generate ${{ parameters.matrixType }} Matrix
serviceConnection: $(build.serviceConnectionName)
internalProjectName: internal
args: $(generateBuildMatrixCommand)
- ${{ else }}:
- script: $(generateBuildMatrixCommand)
displayName: Generate ${{ parameters.matrixType }} Matrix
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
parameters:
name: matrix
displayName: Generate ${{ parameters.matrixType }} Matrix
serviceConnection: $(build.serviceConnectionName)
internalProjectName: internal
args: $(generateBuildMatrixCommand)
6 changes: 6 additions & 0 deletions eng/common/templates/stages/build-test-publish-repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ stages:
isTestStage: true
internalProjectName: ${{ parameters.internalProjectName }}
publicProjectName: ${{ parameters.publicProjectName }}
commonInitStepsForMatrixAndBuild:
- template: /eng/common/templates/steps/common-init-for-matrix-and-build.yml@self
parameters:
noCache: ${{ parameters.noCache }}
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
- template: /eng/common/templates/jobs/test-images-linux-client.yml@self
parameters:
name: Linux_amd64
Expand Down