Skip to content
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/vmr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ stages:
- job: ValidateInstallers_Linux_x64
displayName: Validate Installers - Linux x64
pool: ${{ parameters.pool_Linux }}
timeoutInMinutes: 240
timeoutInMinutes: 30
steps:
- template: ../steps/vmr-validate-installers.yml
parameters:
Expand All @@ -998,7 +998,7 @@ stages:
- job: ValidateInstallers_Linux_arm64
displayName: Validate Installers - Linux arm64
pool: ${{ parameters.pool_LinuxArm64 }}
timeoutInMinutes: 240
timeoutInMinutes: 30
steps:
- template: ../steps/vmr-validate-installers.yml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public LinuxInstallerTests(ITestOutputHelper outputHelper)
_contextDir = Path.Combine(_tmpDir, Path.GetRandomFileName());
Directory.CreateDirectory(_contextDir);

_excludeLinuxArch = Config.Architecture == Architecture.X64 ? "arm64" : "x64";
_excludeLinuxArch = Config.Architecture == Architecture.X64 ?
Copy link
Member

Choose a reason for hiding this comment

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

Could this just be the following? Why is the condition necessary?

Suggested change
_excludeLinuxArch = Config.Architecture == Architecture.X64 ?
_excludeLinuxArch = Architecture.Arm64.ToString().ToLower()

Copy link
Member

Choose a reason for hiding this comment

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

Wrong example... Config.Architecture.ToString().ToLower()

Copy link
Member Author

Choose a reason for hiding this comment

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

For x64 tests we exclude arm64 packages from copying to the image. For arm64 tests we exclude x64 packages.

Copy link
Member

@MichaelSimons MichaelSimons Mar 18, 2025

Choose a reason for hiding this comment

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

I see - taking a step back, my larger question is what will happen if/when additional architectures are added? Ideally this code would be written in a way that would be unaffected.

Copy link
Member Author

Choose a reason for hiding this comment

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

If we add another supported architecture for testing, we'd need to modify this code and the Architecture enum, at the same time.

This member field as an optimization only. We could just iterate over all supported architectures that are not being tested, in the filtering method. That would incur performance cost.

Ideally, as we discussed before, I think filtering should be modified to consume the merged manifest and filter packages based on vertical name/Id. I can do a follow up PR with that change.

Copy link
Member

Choose a reason for hiding this comment

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

I think filtering should be modified to consume the merged manifest and filter packages based on vertical name/Id. I can do a follow up PR with that change.

Sounds good to me.

Architecture.Arm64.ToString().ToLower() :
Architecture.X64.ToString().ToLower();
}

public void Dispose()
Expand Down