Skip to content

Conversation

@lbussell
Copy link
Member

@lbussell lbussell commented Jan 28, 2026

Summary

Fix Windows PR validation failing because ImageBuilder is not pulled. The breaking behavior was added in #1947.

Job-specific init steps (customBuildInitSteps, customGenerateMatrixInitSteps, etc.) were being merged into customInitSteps before being passed to init-common.yml. This caused init-imagebuilder.yml to skip the default ImageBuilder pull when any job-specific steps were provided, since it checks if customInitSteps is non-empty.

Changes

  • Add separate parameters for job-specific init steps in job templates:
    • customBuildInitSteps in build-images.yml
    • customCopyBaseImagesInitSteps in copy-base-images.yml
    • customGenerateMatrixInitSteps in generate-matrix.yml
  • Update build-and-test.yml to pass these parameters separately instead of merging them
  • Add clarifying comments to distinguish the two types of init steps

Testing

Testing via dotnet/dotnet-docker#7016

Previously, job-specific init steps (customBuildInitSteps,
customGenerateMatrixInitSteps, etc.) were merged into customInitSteps
before being passed to init-common.yml. This caused init-imagebuilder.yml
to skip the default ImageBuilder pull when any job-specific steps were
provided, since it checks if customInitSteps is non-empty.

Now each job template accepts both parameters separately:
- customInitSteps: For custom ImageBuilder setup (skips default pull)
- custom*InitSteps: For job-specific setup (runs after ImageBuilder)
@lbussell lbussell requested a review from a team as a code owner January 28, 2026 19:58
@lbussell lbussell merged commit beb58d8 into dotnet:main Jan 28, 2026
20 checks passed
@lbussell lbussell deleted the fix-combined-init-steps branch January 28, 2026 20:57
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.

2 participants