From 3606967315f512e8e61b08cb183fd8a3936472a4 Mon Sep 17 00:00:00 2001 From: Jakub Strzebonski Date: Mon, 9 May 2022 13:45:32 +0200 Subject: [PATCH] #1763 ensure build auto-cancel is turned on --- ci/azure/azure-clang-10-alpine-mpich.yml | 1 + ci/azure/azure-clang-10-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-11-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-12-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-13-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-14-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-3.9-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-5.0-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-9-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 1 + ci/azure/azure-gcc-11-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-12-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-5-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-6-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-7-ubuntu-mpich.yml | 11 ++++++----- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-9-ubuntu-mpich.yml | 1 + ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 1 + ci/azure/azure-nvidia-10-ubuntu-mpich.yml | 1 + ci/azure/azure-nvidia-11-ubuntu-mpich.yml | 1 + scripts/workflows-azure.ini | 2 +- 21 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ci/azure/azure-clang-10-alpine-mpich.yml b/ci/azure/azure-clang-10-alpine-mpich.yml index 2b13aae248..e371e0872e 100644 --- a/ci/azure/azure-clang-10-alpine-mpich.yml +++ b/ci/azure/azure-clang-10-alpine-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 69f7d6560a..a4c754b901 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 870d2a1be3..e9e3d46ba1 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 041ab12d49..82e521f731 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 5f972e2b81..61603fa6cb 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index f806a330f8..6bdbe80a6a 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-3.9-ubuntu-mpich.yml b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml index 6e90aa4b65..807a8e0206 100644 --- a/ci/azure/azure-clang-3.9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-5.0-ubuntu-mpich.yml b/ci/azure/azure-clang-5.0-ubuntu-mpich.yml index bef572bfc0..bc77f58a7d 100644 --- a/ci/azure/azure-clang-5.0-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-5.0-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index fc6bcac5e8..641745990c 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index f57abea621..ef31c595b6 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index a2691c5c84..d5b0047bbe 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index eab46413d0..7509f4046f 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml index e74b0b2874..2c88bad7f6 100644 --- a/ci/azure/azure-gcc-5-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-5-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-6-ubuntu-mpich.yml b/ci/azure/azure-gcc-6-ubuntu-mpich.yml index 927349e04f..fbe5fb4db4 100644 --- a/ci/azure/azure-gcc-6-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-6-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml index 2949c46cb5..333a366167 100644 --- a/ci/azure/azure-gcc-7-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-7-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' @@ -69,7 +70,7 @@ stages: - job: Build displayName: Build pool: - vmImage: 'ubuntu-18.04' + name: 'vt-agent-pool' timeoutInMinutes: 180 steps: - task: Bash@3 @@ -77,7 +78,7 @@ stages: inputs: targetType: 'inline' script: | - echo setup + source /etc/docker-setup.sh - task: Bash@3 displayName: Build timestamp for caching continueOnError: true @@ -134,14 +135,14 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-noinstall' + dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - task: DockerCompose@0 displayName: Build container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: 'run ubuntu-cpp-clean-noinstall' + dockerComposeCommand: 'run ubuntu-cpp-clean' env: CODECOV_TOKEN: $(codecov_token) - task: Bash@3 @@ -172,7 +173,7 @@ stages: dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean-noinstall' + dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 1f1581af47..d363557124 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 9f917f8ad6..bd19aaf4d1 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 3d9aaa239d..38274fcd65 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml index e3a5dfe139..ba83c68f80 100644 --- a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml index 7ca9863f2d..d9490d3db8 100644 --- a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml @@ -11,6 +11,7 @@ trigger: - 1.0.0* pr: + autoCancel: true branches: include: - '*' diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index c2d50c6fe1..43a27338f1 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -37,7 +37,7 @@ workflow_runs_on = "vmImage: 'ubuntu-18.04'" build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(COMPILER)-cache linux_env = " UBUNTU: [% distro %]" vt_diagnostics = 1 -pr_pattern = "pr:\\n branches:\\n include:\\n - '*'\\n" +pr_pattern = "pr:\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" job_setup = "echo setup" vt_no_color = 1 vt_build_shared_libs = 0