From e3954d5f0bca8276b9bf8daf279e1930a66e1c7b Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Tue, 27 Aug 2024 14:25:31 -0400 Subject: [PATCH] #2174: update azure pipelines after rebase --- ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml | 1 + ci/azure/azure-gcc-12-ubuntu-vttv.yml | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml index 9c1099d749..41da998d91 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml @@ -49,6 +49,7 @@ variables: VT_INCLUSION: TPL VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 + VT_TV_ENABLED: 0 CMAKE_CXX_STANDARD: 17 VT_CI_TEST_LB_SCHEMA: 0 RUN_FULL_CI: false diff --git a/ci/azure/azure-gcc-12-ubuntu-vttv.yml b/ci/azure/azure-gcc-12-ubuntu-vttv.yml index b2334e3966..fc797c8a73 100644 --- a/ci/azure/azure-gcc-12-ubuntu-vttv.yml +++ b/ci/azure/azure-gcc-12-ubuntu-vttv.yml @@ -59,6 +59,7 @@ variables: VT_TV_ENABLED: 1 CMAKE_CXX_STANDARD: 17 VT_CI_TEST_LB_SCHEMA: 0 + RUN_FULL_CI: true CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-12-cache volume_name: ubuntu-cpp @@ -85,6 +86,7 @@ stages: - task: Bash@3 displayName: Build timestamp for caching continueOnError: true + condition: eq(variables['RUN_FULL_CI'], 'true') inputs: targetType: 'inline' script: | @@ -107,14 +109,14 @@ stages: - task: Bash@3 displayName: Output timestamp for caching continueOnError: true - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) inputs: targetType: 'inline' script: 'echo "my pipeline variable is $(TS) $(TS_YEAR) $(TS_MONTH) $(TS_DAY)"' - task: Cache@2 displayName: Update cache continueOnError: true - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) @@ -153,7 +155,7 @@ stages: - task: Bash@3 displayName: Put compilation's and tests' logs in PR comment continueOnError: true - condition: and(succeededOrFailed(), eq(variables['Build.Reason'], 'PullRequest')) + condition: and(eq(variables['RUN_FULL_CI'], 'true'), and(succeededOrFailed(), eq(variables['Build.Reason'], 'PullRequest'))) inputs: targetType: 'inline' script: | @@ -183,7 +185,7 @@ stages: - task: Bash@3 displayName: Create artifacts continueOnError: true - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) inputs: targetType: 'inline' script: | @@ -192,7 +194,7 @@ stages: - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) inputs: targetPath: '$(Agent.TempDirectory)/LastTest.log.gz' artifact: 'CMakeLastTestLog' @@ -200,7 +202,7 @@ stages: - task: PublishPipelineArtifact@1 displayName: Upload CMake full output artifact continueOnError: true - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) inputs: targetPath: '$(Agent.TempDirectory)/cmake-output.log.gz' artifact: 'CMakeOutputLog'