Skip to content

Ensure we always run all smoke tests on Docker tag bump PRs #8514

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
andrewlock merged 2 commits into from
May 6, 2026
Merged

Ensure we always run all smoke tests on Docker tag bump PRs #8514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2500b72
Ensure we always run _all_ smoke tests on Docker tag bump PRs
andrewlock Apr 23, 2026
5ce5f16
Update .azure-pipelines/ultimate-pipeline.yml
andrewlock Apr 24, 2026
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
36 changes: 22 additions & 14 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ variables:
isMainBranch: $[in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main')]
isMainOrReleaseBranch: $[or(in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/'))]
isPullRequest: $[eq(variables['Build.Reason'], 'PullRequest')]
# True when the build is for the automated smoke-test docker image bump PR.
# OR'd into the installer-test conditions so the updated digests are exercised
# before a human merges. Kept as a distinct variable (rather than redefining
# run_all_installer_tests in YAML) because defining run_all_installer_tests here
# would block queue-time overrides from the UI — YAML takes precedence and the
# "settable at queue time" UI value would be ignored. The branch name matches
# .github/workflows/auto_bump_smoke_test_docker_images.yml — keep both in sync.
isDockerImageBumpPr: $[eq(variables['System.PullRequest.SourceBranch'], 'bot/smoke-test-docker-image-bump')]

@NachoEchevarria NachoEchevarria Apr 28, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In previous lines, we are using the branch long names. Should we use refs/heads/bot/smoke... here? Alternatively, we could probbly use the short name with .SourceBranchName

@andrewlock andrewlock Apr 28, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Unfortunately, I don't believe we can - the difference is that in PRs, the branch name is a "fake" merge branch, so we can't use the long names. And for non-PRs, this variable isn't set, so we can't use the short names either

# Only run code coverage when requested
# Coverlet relies on IL rewriting, which currently breaks tests which explictly check the IL
CodeCoverageEnabled: $[eq(variables['run_code_coverage'], 'true')]
Expand Down Expand Up @@ -5040,7 +5048,7 @@ stages:

# NuGet x64 (LinuxNuGet)
- stage: smoke_x64_nuget_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, package_windows, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5054,7 +5062,7 @@ stages:

# NuGet arm64 (LinuxNuGetArm64)
- stage: smoke_arm64_nuget_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, package_windows, generate_variables, merge_commit_id]
pool:
name: $(linuxArm64Pool)
Expand All @@ -5068,7 +5076,7 @@ stages:

# AzureFunctions Nuget x64 (LinuxAzureFunctionsNuGet)
- stage: smoke_x64_azurefunctions_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, package_windows, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5082,7 +5090,7 @@ stages:

# DotnetTool x64 (LinuxDotnetTool)
- stage: smoke_x64_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5095,7 +5103,7 @@ stages:

# DotnetTool arm64 (LinuxDotnetToolArm64)
- stage: smoke_arm64_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxArm64Pool)
Expand All @@ -5108,7 +5116,7 @@ stages:

# DotnetToolNuget (LinuxDotnetToolNuget)
- stage: smoke_x64_tool_nuget_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5121,7 +5129,7 @@ stages:

# DotnetTool musl x64 (LinuxMuslDotnetTool)
- stage: smoke_musl_x64_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5134,7 +5142,7 @@ stages:

# DotnetTool musl arm64 (LinuxMuslDotnetToolArm64)
- stage: smoke_musl_arm64_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxArm64Pool)
Expand Down Expand Up @@ -5173,7 +5181,7 @@ stages:

# Self-instrument (LinuxSelfInstrument)
- stage: smoke_x64_self_instrument_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [package_linux, dotnet_tool, generate_variables, merge_commit_id]
pool:
name: $(linuxX64SmokePool)
Expand All @@ -5187,7 +5195,7 @@ stages:

# Windows MSI (WindowsMsi)
- stage: smoke_win_msi_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [package_windows, generate_variables, merge_commit_id]
pool:
vmImage: windows-2022
Expand All @@ -5200,7 +5208,7 @@ stages:

# Windows NuGet (WindowsNuGet)
- stage: smoke_win_nuget_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, package_windows, generate_variables, merge_commit_id]
pool:
vmImage: windows-2022
Expand All @@ -5214,7 +5222,7 @@ stages:

# Windows Azure Functions NuGet (WindowsAzureFunctionsNuGet)
- stage: smoke_win_azurefunctions_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, package_windows, generate_variables, merge_commit_id]
pool:
vmImage: windows-2022
Expand All @@ -5228,7 +5236,7 @@ stages:

# Windows DotnetTool (WindowsDotnetTool)
- stage: smoke_win_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
pool:
vmImage: windows-2022
Expand Down Expand Up @@ -5266,7 +5274,7 @@ stages:
- fleet-installer-telemetry-forwarder

- stage: smoke_macos_tool_tests
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true'), eq(variables.isDockerImageBumpPr, 'true')))
dependsOn: [dotnet_tool, generate_variables, merge_commit_id]
variables:
targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/auto_bump_smoke_test_docker_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ jobs:
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
with:
token: ${{ steps.octo-sts.outputs.token }}
# The branch name is referenced in .azure-pipelines/ultimate-pipeline.yml
# (isDockerImageBumpPr) to force-enable the installer tests on this PR.
# Keep the two in sync if this ever changes.
branch: "bot/smoke-test-docker-image-bump"
commit-message: "[Smoke Test Docker Image Bump]"
delete-branch: true
Expand Down
Loading