Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion .azure-pipelines/ultimate-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,6 @@ stages:
variables:
TestAllPackageVersions: true
IncludeMinorPackageVersions: $[eq(variables.perform_comprehensive_testing, 'true')]
IntegrationTestFilter: DockerGroup=$(dockerGroup)

pool:
name: $(linuxX64Pool)
Expand All @@ -2319,6 +2318,14 @@ stages:
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)
- bash: |
if [ -z "$(IntegrationTestFilter)" ]; then
newFilter="DockerGroup=$(dockerGroup)"
else
newFilter="$(IntegrationTestFilter)&(DockerGroup=$(dockerGroup))"
fi
echo "##vso[task.setvariable variable=IntegrationTestFilter]$newFilter"
displayName: "Calculate IntegrationTestFilter"

# when we build samples separately, we could run this step and the docker-compose one below in //
# (currently the docker-compose step relies on serverless samples)
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/_build/Build.VariableGenerations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void GenerateConditionVariableBasedOnGitChange(ChangedTeamValue changedTeamValue
{
var baseBranch = string.IsNullOrEmpty(TargetBranch) ? ReleaseBranchForCurrentVersion() : $"origin/{TargetBranch}";
bool isChanged = false;
var forceExplorationTestsWithVariableName = $"force_exploration_tests_with_{changedTeamValue.VariableName}";
var forceExplorationTestsWithVariableName = $"force_run_tests_with_{changedTeamValue.VariableName}";

if (Environment.GetEnvironmentVariable("BUILD_REASON") == "Schedule" && bool.Parse(Environment.GetEnvironmentVariable("isMainBranch") ?? "false"))
{
Expand Down
Loading