From b11970b6e19d0b80256315d7afd72394c651d250 Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Thu, 17 Jul 2025 13:56:43 +0200 Subject: [PATCH 1/9] [SDCI-1583] Adding concurrency control --- .gitlab/ssi_gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab/ssi_gitlab-ci.yml b/.gitlab/ssi_gitlab-ci.yml index a32253d046e..7debf4b2530 100644 --- a/.gitlab/ssi_gitlab-ci.yml +++ b/.gitlab/ssi_gitlab-ci.yml @@ -1,6 +1,10 @@ include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/2fc0ca684c4322af76c172905af32c6c583303dcecb07dba05bac5f85b7606ae/single-step-instrumentation-tests.yml +concurrency: + group: $CI_COMMIT_REF_SLUG + cancel_outdated_jobs: true + stages: - SSI_TESTS - DOCKER_SSI From 3116f1bba323b69edda52ad9969637826fe90a8b Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Thu, 17 Jul 2025 13:57:23 +0200 Subject: [PATCH 2/9] [SDCI-1583] Dummy commit --- .gitlab/ssi_gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ssi_gitlab-ci.yml b/.gitlab/ssi_gitlab-ci.yml index 7debf4b2530..dbee0ec83db 100644 --- a/.gitlab/ssi_gitlab-ci.yml +++ b/.gitlab/ssi_gitlab-ci.yml @@ -5,6 +5,7 @@ concurrency: group: $CI_COMMIT_REF_SLUG cancel_outdated_jobs: true + stages: - SSI_TESTS - DOCKER_SSI From ecd10f6e43b8810f7f26b0d4c58241d6f4cbd37e Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Thu, 17 Jul 2025 13:57:29 +0200 Subject: [PATCH 3/9] [SDCI-1583] Dummy commit --- .gitlab/ssi_gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/ssi_gitlab-ci.yml b/.gitlab/ssi_gitlab-ci.yml index dbee0ec83db..7debf4b2530 100644 --- a/.gitlab/ssi_gitlab-ci.yml +++ b/.gitlab/ssi_gitlab-ci.yml @@ -5,7 +5,6 @@ concurrency: group: $CI_COMMIT_REF_SLUG cancel_outdated_jobs: true - stages: - SSI_TESTS - DOCKER_SSI From fbb8c6abf062c155436a1647f5509b01e7243e79 Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Thu, 17 Jul 2025 17:39:13 +0200 Subject: [PATCH 4/9] [SDCI-1583] Adding concurrency control --- .gitlab-ci.yml | 4 ++++ .gitlab/ssi_gitlab-ci.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acce87905ca..312dd4548b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,10 @@ include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/2fc0ca684c4322af76c172905af32c6c583303dcecb07dba05bac5f85b7606ae/single-step-instrumentation-tests.yml +concurrency: + group: $CI_COMMIT_REF_SLUG + cancel_outdated_jobs: true + stages: - configure - nodejs diff --git a/.gitlab/ssi_gitlab-ci.yml b/.gitlab/ssi_gitlab-ci.yml index 7debf4b2530..a32253d046e 100644 --- a/.gitlab/ssi_gitlab-ci.yml +++ b/.gitlab/ssi_gitlab-ci.yml @@ -1,10 +1,6 @@ include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/2fc0ca684c4322af76c172905af32c6c583303dcecb07dba05bac5f85b7606ae/single-step-instrumentation-tests.yml -concurrency: - group: $CI_COMMIT_REF_SLUG - cancel_outdated_jobs: true - stages: - SSI_TESTS - DOCKER_SSI From b4848c0a69fabc8b97fbbb33e57b1b80281db624 Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Thu, 17 Jul 2025 17:41:31 +0200 Subject: [PATCH 5/9] [SDCI-1583] Adding concurrency control --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 312dd4548b0..7740413d029 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,6 @@ include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/2fc0ca684c4322af76c172905af32c6c583303dcecb07dba05bac5f85b7606ae/single-step-instrumentation-tests.yml -concurrency: - group: $CI_COMMIT_REF_SLUG - cancel_outdated_jobs: true - stages: - configure - nodejs @@ -25,6 +21,9 @@ compute_pipeline: image: registry.ddbuild.io/ci/libdatadog-build/system-tests:57161036 tags: ["arch:amd64"] stage: configure + concurrency: + group: $CI_COMMIT_REF_SLUG + cancel_outdated_jobs: true variables: CI_ENVIRONMENT: "prod" script: From 6f12b53609a726b62cd4683e9f4cd4f8791f4ac5 Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Tue, 12 Aug 2025 10:33:12 +0200 Subject: [PATCH 6/9] Add cancelling concurrent executions --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7740413d029..d2553214983 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +workflow: + auto_cancel: + on_new_commit: interruptible + include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/2fc0ca684c4322af76c172905af32c6c583303dcecb07dba05bac5f85b7606ae/single-step-instrumentation-tests.yml @@ -12,6 +16,9 @@ stages: - pipeline-status - system-tests-utils +default: + interruptible: true + variables: # Do not modify this - must be the repository name for Kubernetes gitlab runners to run KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: system-tests #helm-charts @@ -21,9 +28,6 @@ compute_pipeline: image: registry.ddbuild.io/ci/libdatadog-build/system-tests:57161036 tags: ["arch:amd64"] stage: configure - concurrency: - group: $CI_COMMIT_REF_SLUG - cancel_outdated_jobs: true variables: CI_ENVIRONMENT: "prod" script: From a14b71404887b666b264f40000e1d9d4f970d71b Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Tue, 12 Aug 2025 10:33:54 +0200 Subject: [PATCH 7/9] Dummy commit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2553214983..dfaf9af0c07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ stages: default: interruptible: true + #dummy commit variables: # Do not modify this - must be the repository name for Kubernetes gitlab runners to run From 7803950ef3d9c4fc5a61ca29b619b6ec9ad2569d Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Tue, 12 Aug 2025 10:34:37 +0200 Subject: [PATCH 8/9] Removing interruptible --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfaf9af0c07..142a783d629 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: - system-tests-utils default: - interruptible: true + interruptible: false #dummy commit variables: From 08882ae0a7e97a80054590b653b5913f0c936626 Mon Sep 17 00:00:00 2001 From: Rodrigo Mendoza Date: Tue, 12 Aug 2025 10:34:48 +0200 Subject: [PATCH 9/9] Dummy commit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 142a783d629..391109ef959 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ stages: default: interruptible: false - #dummy commit + #dummy commit 2 variables: # Do not modify this - must be the repository name for Kubernetes gitlab runners to run