From 2bceeb0a3cc0c675d8462aead4a69500dd577831 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Mon, 1 Dec 2025 13:18:52 -0500 Subject: [PATCH 01/11] adding datadog-lambda-python ci to pipeline --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08297bf612e..4edd000577c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,6 +90,24 @@ run-tests-trigger: hatch run lint:sg echo -e "\e[0Ksection_end:`date +%s`:sg_scan\r\e[0K" +"trigger serverless lambda tests": + stage: tests + trigger: + project: DataDog/datadog-lambda-python/ + strategy: depend + needs: + - job: publish-wheels-to-s3 + variables: + UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID + UPSTREAM_PROJECT_URL: $CI_PROJECT_URL + UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH + UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR + UPSTREAM_COMMIT_TITLE: $CI_COMMIT_TITLE + UPSTREAM_COMMIT_TAG: $CI_COMMIT_TAG + UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME + UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN + UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL + microbenchmarks: stage: benchmarks needs: [ "download_ddtrace_artifacts" ] From f47202139ceb837c39a6e751c2cc45ad60f1885d Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Tue, 2 Dec 2025 10:13:43 -0500 Subject: [PATCH 02/11] remove quotation marks --- .gitlab-ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4edd000577c..b2efdbb0cdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,23 +74,7 @@ run-tests-trigger: job: tests-gen strategy: depend -# Validate the ast-grep rule's test suite in .sg/tests -"ast-grep rules": - extends: .testrunner - stage: tests - needs: [] - script: - script: - - | - echo -e "\e[0Ksection_start:`date +%s`:sg_test[collapsed=true]\r\e[0KValidate ast-grep rules" - hatch run lint:sg-test - echo -e "\e[0Ksection_end:`date +%s`:sg_test\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:sg_scan[collapsed=true]\r\e[0Kast-grep scan" - hatch run lint:sg - echo -e "\e[0Ksection_end:`date +%s`:sg_scan\r\e[0K" - -"trigger serverless lambda tests": +trigger serverless lambda tests: stage: tests trigger: project: DataDog/datadog-lambda-python/ @@ -108,6 +92,22 @@ run-tests-trigger: UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL +# Validate the ast-grep rule's test suite in .sg/tests +"ast-grep rules": + extends: .testrunner + stage: tests + needs: [] + script: + script: + - | + echo -e "\e[0Ksection_start:`date +%s`:sg_test[collapsed=true]\r\e[0KValidate ast-grep rules" + hatch run lint:sg-test + echo -e "\e[0Ksection_end:`date +%s`:sg_test\r\e[0K" + - | + echo -e "\e[0Ksection_start:`date +%s`:sg_scan[collapsed=true]\r\e[0Kast-grep scan" + hatch run lint:sg + echo -e "\e[0Ksection_end:`date +%s`:sg_scan\r\e[0K" + microbenchmarks: stage: benchmarks needs: [ "download_ddtrace_artifacts" ] From ed798ad15cec01e8e5b240f5aa1acf0c93c55c4a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Wed, 3 Dec 2025 16:40:33 -0500 Subject: [PATCH 03/11] adding hyphens --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2efdbb0cdf..14e8d749355 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ run-tests-trigger: job: tests-gen strategy: depend -trigger serverless lambda tests: +trigger-serverless-lambda-tests: stage: tests trigger: project: DataDog/datadog-lambda-python/ From a6c18e77c5c485a9fb2e0306164ed67720fe2eb1 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 5 Dec 2025 11:04:40 -0500 Subject: [PATCH 04/11] quote and colon trigger --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14e8d749355..bc26fbca5ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ run-tests-trigger: job: tests-gen strategy: depend -trigger-serverless-lambda-tests: +"trigger serverless lambda tests":: stage: tests trigger: project: DataDog/datadog-lambda-python/ From 0fe39e917a4c65c528332f379fead3741aaae6d3 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 5 Dec 2025 13:55:11 -0500 Subject: [PATCH 05/11] removing trailing slash --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc26fbca5ae..6a7aae95e62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,10 +74,10 @@ run-tests-trigger: job: tests-gen strategy: depend -"trigger serverless lambda tests":: +trigger-serverless-lambda-tests: stage: tests trigger: - project: DataDog/datadog-lambda-python/ + project: DataDog/datadog-lambda-python strategy: depend needs: - job: publish-wheels-to-s3 From 93ce6f8c39a307cfafc3f0c5019f7d4c9775137a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 5 Dec 2025 15:25:52 -0500 Subject: [PATCH 06/11] including lambda config file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a7aae95e62..599c294ad00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,7 @@ trigger-serverless-lambda-tests: trigger: project: DataDog/datadog-lambda-python strategy: depend + include: DataDog/datadog-lambda-python/.gitlab-ci.yml needs: - job: publish-wheels-to-s3 variables: From 63d967f40d794f63453ac094262950f0bba9ba08 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Wed, 10 Dec 2025 14:07:04 -0500 Subject: [PATCH 07/11] remove include, specify branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 599c294ad00..c9e2018a738 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ trigger-serverless-lambda-tests: trigger: project: DataDog/datadog-lambda-python strategy: depend - include: DataDog/datadog-lambda-python/.gitlab-ci.yml + branch: main needs: - job: publish-wheels-to-s3 variables: From ea5c2cb9bbd0b040fb22b5ac97e6eef91577fc2e Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 12 Dec 2025 12:58:41 -0500 Subject: [PATCH 08/11] testing with changes to lambda ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9e2018a738..aec0f5a2a47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ trigger-serverless-lambda-tests: trigger: project: DataDog/datadog-lambda-python strategy: depend - branch: main + branch: rithika.narayan/APMSVLS-284-dd-trace-py-ci needs: - job: publish-wheels-to-s3 variables: From b3b066c76ec81c7cdbe10139bb8a08016ae67fdf Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Tue, 16 Dec 2025 14:15:09 -0500 Subject: [PATCH 09/11] Rename job, add SKIP_E2E_TESTS --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b5b577ea78..93e29c2d457 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ run-tests-trigger: job: tests-gen strategy: depend -trigger-serverless-lambda-tests: +serverless lambda tests: stage: tests trigger: project: DataDog/datadog-lambda-python @@ -138,6 +138,7 @@ trigger-serverless-lambda-tests: UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL + SKIP_E2E_TESTS: true # Validate the ast-grep rule's test suite in .sg/tests "ast-grep rules": From fbe3eae7ba4fe949e2f0d27fa1459233f2bbbef5 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Tue, 16 Dec 2025 14:24:33 -0500 Subject: [PATCH 10/11] make skip flag a string --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93e29c2d457..9824515e6b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ serverless lambda tests: UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL - SKIP_E2E_TESTS: true + SKIP_E2E_TESTS: "true" # Validate the ast-grep rule's test suite in .sg/tests "ast-grep rules": From 469dac227e784027073e1973c78041e4f115d824 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Tue, 16 Dec 2025 14:57:29 -0500 Subject: [PATCH 11/11] Update lambda branch to main --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9824515e6b3..5bc13b851b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ serverless lambda tests: trigger: project: DataDog/datadog-lambda-python strategy: depend - branch: rithika.narayan/APMSVLS-284-dd-trace-py-ci + branch: main needs: - job: publish-wheels-to-s3 variables: