Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 1a05a56

Browse files
authored
Don't push artifacts to AWS/Azure unless on main/master (#2019)
In #1962 and #1963, we recently updated the isMainBranch variable to treat `release/*` branches as "main". This was so that we run the "full" integration tests suite on merges to release branches. However, this change meant we also started pushing those assets to Azure and AWS, meaning the assets there are a mix of both `release/2.0` bits and `master` bits. This makes some of the other automation problematic, so we should revert to only pushing those bits if we're on `master`.
1 parent cab2751 commit 1a05a56

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.azure-pipelines/ultimate-pipeline.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ variables:
7272
monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home
7373
artifacts: $(System.DefaultWorkingDirectory)/tracer/src/bin/artifacts
7474
ddApiKey: $(DD_API_KEY)
75-
isMainBranch: $[or(in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
75+
isMainBranch: $[in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main')]
76+
isMainOrReleaseBranch: $[or(in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
7677
isPullRequest: $[eq(variables['Build.Reason'], 'PullRequest')]
7778
DD_DOTNET_TRACER_MSBUILD:
7879
NugetPackageDirectory: $(System.DefaultWorkingDirectory)/packages
@@ -666,7 +667,7 @@ stages:
666667

667668
variables:
668669
TestAllPackageVersions: true
669-
IncludeMinorPackageVersions: $[or(eq(variables.isMainBranch, 'true'), eq(variables.perform_comprehensive_testing, 'true'))]
670+
IncludeMinorPackageVersions: $[or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.perform_comprehensive_testing, 'true'))]
670671

671672
pool:
672673
vmImage: ubuntu-18.04
@@ -750,7 +751,7 @@ stages:
750751
- job: Test
751752
variables:
752753
TestAllPackageVersions: true
753-
IncludeMinorPackageVersions: $[or(eq(variables.isMainBranch, 'true'), eq(variables.perform_comprehensive_testing, 'true'))]
754+
IncludeMinorPackageVersions: $[or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.perform_comprehensive_testing, 'true'))]
754755
publishTargetFramework: net5.0
755756
baseImage: debian
756757
workspace:

0 commit comments

Comments
 (0)