Skip to content

Commit 068cdd0

Browse files
authored
Tweak CI variables (#7784)
## Summary of changes - Don't clobber the global filter in linux integration tests - Rename the "force" variables to not imply they're specific to "exploration" tests ## Reason for change - The filter gets clobbered - if you explicitly set the `Filter` variable it gets ignored in linux integration tests - It's confusing having exploration in the name ## Implementation details Fix it ## Test coverage Meh
1 parent 4888a57 commit 068cdd0

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.azure-pipelines/ultimate-pipeline.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,6 @@ stages:
23022302
variables:
23032303
TestAllPackageVersions: true
23042304
IncludeMinorPackageVersions: $[eq(variables.perform_comprehensive_testing, 'true')]
2305-
IntegrationTestFilter: DockerGroup=$(dockerGroup)
23062305

23072306
pool:
23082307
name: $(linuxX64Pool)
@@ -2319,6 +2318,14 @@ stages:
23192318
- template: steps/download-samples.yml
23202319
parameters:
23212320
framework: $(publishTargetFramework)
2321+
- bash: |
2322+
if [ -z "$(IntegrationTestFilter)" ]; then
2323+
newFilter="DockerGroup=$(dockerGroup)"
2324+
else
2325+
newFilter="$(IntegrationTestFilter)&(DockerGroup=$(dockerGroup))"
2326+
fi
2327+
echo "##vso[task.setvariable variable=IntegrationTestFilter]$newFilter"
2328+
displayName: "Calculate IntegrationTestFilter"
23222329
23232330
# when we build samples separately, we could run this step and the docker-compose one below in //
23242331
# (currently the docker-compose step relies on serverless samples)

tracer/build/_build/Build.VariableGenerations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void GenerateConditionVariableBasedOnGitChange(ChangedTeamValue changedTeamValue
107107
{
108108
var baseBranch = string.IsNullOrEmpty(TargetBranch) ? ReleaseBranchForCurrentVersion() : $"origin/{TargetBranch}";
109109
bool isChanged = false;
110-
var forceExplorationTestsWithVariableName = $"force_exploration_tests_with_{changedTeamValue.VariableName}";
110+
var forceExplorationTestsWithVariableName = $"force_run_tests_with_{changedTeamValue.VariableName}";
111111

112112
if (Environment.GetEnvironmentVariable("BUILD_REASON") == "Schedule" && bool.Parse(Environment.GetEnvironmentVariable("isMainBranch") ?? "false"))
113113
{

0 commit comments

Comments
 (0)