From 728457a249771410524bbbf5e90fe9046761445f Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 24 Jun 2019 23:10:50 -0700 Subject: [PATCH] Offload Helix onto a separate pipeline --- azure-pipelines.yml | 2 +- eng/pipeline.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d13448129..1ac44fa05 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ variables: # This is set in the pipeline directly # When set to false, CI tests will not be enabled in builds. # -# _ContinuousIntegrationTestsEnabled: true +# _ContinuousIntegrationTestsEnabled: false # Setting batch to true, triggers one build at a time. # if there is a push while a build in progress, it will wait, diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 1d013cc70..8eb60684b 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -140,6 +140,8 @@ jobs: $(_OfficialBuildIdArgs) $(_PlatformArgs) displayName: Windows Build / Publish + # This condition should be kept in sync with the condition for 'Run DRTs' step + condition: or(ne(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true'), and(eq(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))) # Run DRTs - powershell: eng\common\cibuild.cmd @@ -157,4 +159,5 @@ jobs: HelixAccessToken: $(_HelixToken) # only defined for internal CI Creator: $(_HelixCreator) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), ne(variables['_ContinuousIntegrationTestsEnabled'], 'false')) # on helix machine (with real signing) when running on the public build pipeline + # This condition should be kept in sync with the condition for cibuild.cmd step + condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) # on helix machine (with real signing) when running on the public build pipeline