From 1e5bd2074e178e2c815e774b163a5d6c667cd4dc Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Thu, 11 Dec 2025 17:04:25 -0500
Subject: [PATCH 01/15] Running Gitlab jobs based on upstream pipeline
 existence

---
 .gitlab-ci.yml                |  4 +++-
 ci/input_files/build.yaml.tpl | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f36a781d..943e5a841 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,5 +25,7 @@ build-layers:
       - artifact: ci/build-pipeline.yaml
         job: generator
     strategy: depend
+    forward:
+      pipeline_variables: true
   rules:
-    - when: on_success
+    - when: on_success
\ No newline at end of file
diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 599160fbf..0e0238c37 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -111,6 +111,8 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: manual
   needs:
@@ -142,6 +144,8 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
     - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
       when: on_success
     - if: '"{{ $environment_name }}" == "sandbox"'
@@ -188,6 +192,8 @@ publish-pypi-package:
   before_script: *python-before-script
   cache: []
   rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   when: manual
   needs: {{ range $runtime := (ds "runtimes").runtimes }}
@@ -200,6 +206,9 @@ layer bundle:
   stage: build
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10
+  rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
   needs:
     {{ range (ds "runtimes").runtimes }}
     - build-layer ({{ .name }}-{{ .arch }})
@@ -223,6 +232,8 @@ signed layer bundle:
   image: registry.ddbuild.io/images/docker:20.10-py3
   tags: ["arch:amd64"]
   rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   needs:
     {{ range (ds "runtimes").runtimes }}
@@ -247,6 +258,9 @@ e2e-test:
   trigger:
     project: DataDog/serverless-e2e-tests
     strategy: depend
+  rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
   variables:
       LANGUAGES_SUBSET: python
       # These env vars are inherited from the dotenv reports of the publish-layer jobs
@@ -265,6 +279,9 @@ e2e-test:
 e2e-test-status:
   stage: e2e
   image: registry.ddbuild.io/images/docker:20.10-py3
+  rules:
+    - if: $UPSTREAM_COMMIT_BRANCH
+      when: never
   tags: ["arch:amd64"]
   timeout: 3h
   script: |

From 092d5df8dc48e68c7ea50b39920f46e2b94ef95c Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Thu, 11 Dec 2025 17:24:08 -0500
Subject: [PATCH 02/15] check value of env var

---
 ci/input_files/build.yaml.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 0e0238c37..3b6f5436e 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -53,6 +53,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   variables:
     CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
   script:
+    - echo $UPSTREAM_COMMIT_BRANCH
     - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/build_layers.sh
 
 check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):

From 230f9d0b90ee8b1414f2c527f7395b61c8de6648 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 10:02:26 -0500
Subject: [PATCH 03/15] more prints

---
 ci/input_files/build.yaml.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 3b6f5436e..57f168a29 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -180,6 +180,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   before_script:
     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source ./ci/get_secrets.sh
   script:
+    - echo $UPSTREAM_COMMIT_BRANCH
     - STAGE={{ $environment_name }} PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} DOTENV={{ $dotenv }} ./ci/publish_layers.sh
 
 {{- end }}
@@ -201,6 +202,7 @@ publish-pypi-package:
     - sign-layer ({{ $runtime.name }}-{{ $runtime.arch}})
   {{- end }}
   script:
+    - echo $UPSTREAM_COMMIT_BRANCH
     - ./ci/publish_pypi.sh
 
 layer bundle:

From ead0a9a46bd120bc5dde904a846f1d97b9a2f86e Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 10:16:33 -0500
Subject: [PATCH 04/15] removing gate on e2e tests

---
 ci/input_files/build.yaml.tpl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 57f168a29..7c899c133 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -261,9 +261,6 @@ e2e-test:
   trigger:
     project: DataDog/serverless-e2e-tests
     strategy: depend
-  rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
-      when: never
   variables:
       LANGUAGES_SUBSET: python
       # These env vars are inherited from the dotenv reports of the publish-layer jobs
@@ -282,9 +279,6 @@ e2e-test:
 e2e-test-status:
   stage: e2e
   image: registry.ddbuild.io/images/docker:20.10-py3
-  rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
-      when: never
   tags: ["arch:amd64"]
   timeout: 3h
   script: |

From 1e5345549eaebae91b0d03305884031647aeb74d Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 10:26:15 -0500
Subject: [PATCH 05/15] another print

---
 ci/input_files/build.yaml.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 7c899c133..140039603 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -285,6 +285,7 @@ e2e-test-status:
       GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)
       URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/bridges"
       echo "Fetching E2E job status from: $URL"
+      echo $UPSTREAM_COMMIT_BRANCH
       while true; do
         RESPONSE=$(curl -s --header "PRIVATE-TOKEN: ${GITLAB_API_TOKEN}" "$URL")
         E2E_JOB_STATUS=$(echo "$RESPONSE" | jq -r '.[] | select(.name=="e2e-test") | .downstream_pipeline.status')

From d18c5cd40373242332a7ea08e18617303da75936 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 11:35:09 -0500
Subject: [PATCH 06/15] print

---
 ci/input_files/build.yaml.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 140039603..f3ec33c4a 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -282,10 +282,10 @@ e2e-test-status:
   tags: ["arch:amd64"]
   timeout: 3h
   script: |
+      echo $UPSTREAM_COMMIT_BRANCH
       GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)
       URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/bridges"
       echo "Fetching E2E job status from: $URL"
-      echo $UPSTREAM_COMMIT_BRANCH
       while true; do
         RESPONSE=$(curl -s --header "PRIVATE-TOKEN: ${GITLAB_API_TOKEN}" "$URL")
         E2E_JOB_STATUS=$(echo "$RESPONSE" | jq -r '.[] | select(.name=="e2e-test") | .downstream_pipeline.status')

From 490944f89984d0938b3ef1fec78475ff6d812e98 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 12:20:17 -0500
Subject: [PATCH 07/15] using upstream project name variable

---
 ci/input_files/build.yaml.tpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index f3ec33c4a..d8be029b0 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -261,6 +261,9 @@ e2e-test:
   trigger:
     project: DataDog/serverless-e2e-tests
     strategy: depend
+  rules:
+    - if $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+      when: never
   variables:
       LANGUAGES_SUBSET: python
       # These env vars are inherited from the dotenv reports of the publish-layer jobs
@@ -281,8 +284,10 @@ e2e-test-status:
   image: registry.ddbuild.io/images/docker:20.10-py3
   tags: ["arch:amd64"]
   timeout: 3h
+  rules:
+    - if $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+      when: never
   script: |
-      echo $UPSTREAM_COMMIT_BRANCH
       GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)
       URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/bridges"
       echo "Fetching E2E job status from: $URL"

From 50e9421a8a35fa6d92eb8e11ebd235070c290a51 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 12:32:15 -0500
Subject: [PATCH 08/15] colons

---
 ci/input_files/build.yaml.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index d8be029b0..3c3687a6d 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -262,7 +262,7 @@ e2e-test:
     project: DataDog/serverless-e2e-tests
     strategy: depend
   rules:
-    - if $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
   variables:
       LANGUAGES_SUBSET: python
@@ -285,7 +285,7 @@ e2e-test-status:
   tags: ["arch:amd64"]
   timeout: 3h
   rules:
-    - if $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
   script: |
       GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)

From 14e4cae716279fa96fede35222d89c1e40ffb3af Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 12:51:12 -0500
Subject: [PATCH 09/15] when on success

---
 ci/input_files/build.yaml.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 3c3687a6d..1f89119ae 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -264,6 +264,7 @@ e2e-test:
   rules:
     - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
+    - when: on_success
   variables:
       LANGUAGES_SUBSET: python
       # These env vars are inherited from the dotenv reports of the publish-layer jobs
@@ -287,6 +288,7 @@ e2e-test-status:
   rules:
     - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
+    - when: on_success
   script: |
       GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)
       URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/bridges"

From 021eb2322e6f6b3922547880543497c4b2153165 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 13:25:28 -0500
Subject: [PATCH 10/15] Replace commit branch with project name

---
 ci/input_files/build.yaml.tpl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 1f89119ae..9c5da453c 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -53,7 +53,6 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   variables:
     CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
   script:
-    - echo $UPSTREAM_COMMIT_BRANCH
     - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/build_layers.sh
 
 check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):
@@ -112,7 +111,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: manual
@@ -145,7 +144,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
     - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
       when: on_success
@@ -180,7 +179,6 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   before_script:
     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source ./ci/get_secrets.sh
   script:
-    - echo $UPSTREAM_COMMIT_BRANCH
     - STAGE={{ $environment_name }} PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} DOTENV={{ $dotenv }} ./ci/publish_layers.sh
 
 {{- end }}
@@ -194,7 +192,7 @@ publish-pypi-package:
   before_script: *python-before-script
   cache: []
   rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   when: manual
@@ -202,7 +200,6 @@ publish-pypi-package:
     - sign-layer ({{ $runtime.name }}-{{ $runtime.arch}})
   {{- end }}
   script:
-    - echo $UPSTREAM_COMMIT_BRANCH
     - ./ci/publish_pypi.sh
 
 layer bundle:
@@ -210,7 +207,7 @@ layer bundle:
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10
   rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
   needs:
     {{ range (ds "runtimes").runtimes }}
@@ -235,7 +232,7 @@ signed layer bundle:
   image: registry.ddbuild.io/images/docker:20.10-py3
   tags: ["arch:amd64"]
   rules:
-    - if: $UPSTREAM_COMMIT_BRANCH
+    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   needs:

From b1632a2afb62948a78e939b83abc61ee0a16e559 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Fri, 12 Dec 2025 14:07:40 -0500
Subject: [PATCH 11/15] force fail

---
 ci/input_files/build.yaml.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 9c5da453c..4d6a08a03 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -53,6 +53,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   variables:
     CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
   script:
+    - exit 1
     - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/build_layers.sh
 
 check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):

From 93d9191d30a8a091e1c399784f2d4e87eae6b313 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Tue, 16 Dec 2025 13:19:56 -0500
Subject: [PATCH 12/15] remove force fail

---
 ci/input_files/build.yaml.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 4d6a08a03..d929d8abd 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -53,7 +53,6 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   variables:
     CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
   script:
-    - exit 1
     - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/build_layers.sh
 
 check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):
@@ -210,6 +209,7 @@ layer bundle:
   rules:
     - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
       when: never
+    - when: on_success
   needs:
     {{ range (ds "runtimes").runtimes }}
     - build-layer ({{ .name }}-{{ .arch }})

From c8555e929f904bc84d4668de6d4376cf2245c4bf Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Tue, 16 Dec 2025 14:08:50 -0500
Subject: [PATCH 13/15] Use skip e2e tests global variable

---
 .gitlab-ci.yml                |  3 +++
 ci/input_files/build.yaml.tpl | 16 ++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 943e5a841..5b393f083 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+variables:
+  SKIP_E2E_TESTS: false
+
 stages:
   - pre 
   - build
diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index d929d8abd..4c96a0c54 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -111,8 +111,6 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
-      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: manual
   needs:
@@ -144,7 +142,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $SKIP_E2E_TESTS
       when: never
     - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
       when: on_success
@@ -192,7 +190,7 @@ publish-pypi-package:
   before_script: *python-before-script
   cache: []
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $SKIP_E2E_TESTS
       when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   when: manual
@@ -206,10 +204,6 @@ layer bundle:
   stage: build
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10
-  rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
-      when: never
-    - when: on_success
   needs:
     {{ range (ds "runtimes").runtimes }}
     - build-layer ({{ .name }}-{{ .arch }})
@@ -233,8 +227,6 @@ signed layer bundle:
   image: registry.ddbuild.io/images/docker:20.10-py3
   tags: ["arch:amd64"]
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
-      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   needs:
     {{ range (ds "runtimes").runtimes }}
@@ -260,7 +252,7 @@ e2e-test:
     project: DataDog/serverless-e2e-tests
     strategy: depend
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $SKIP_E2E_TESTS
       when: never
     - when: on_success
   variables:
@@ -284,7 +276,7 @@ e2e-test-status:
   tags: ["arch:amd64"]
   timeout: 3h
   rules:
-    - if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
+    - if: $SKIP_E2E_TESTS
       when: never
     - when: on_success
   script: |

From a70aaf65cd97db2599f12b8dcca394eac71cfa43 Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Tue, 16 Dec 2025 14:14:19 -0500
Subject: [PATCH 14/15] check skip_e2e_test=true explicitly

---
 ci/input_files/build.yaml.tpl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 4c96a0c54..603dca4c5 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -142,7 +142,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: $SKIP_E2E_TESTS
+    - if: '$SKIP_E2E_TESTS == true'
       when: never
     - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
       when: on_success
@@ -190,8 +190,6 @@ publish-pypi-package:
   before_script: *python-before-script
   cache: []
   rules:
-    - if: $SKIP_E2E_TESTS
-      when: never
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   when: manual
   needs: {{ range $runtime := (ds "runtimes").runtimes }}
@@ -252,7 +250,7 @@ e2e-test:
     project: DataDog/serverless-e2e-tests
     strategy: depend
   rules:
-    - if: $SKIP_E2E_TESTS
+    - if: '$SKIP_E2E_TESTS == true'
       when: never
     - when: on_success
   variables:
@@ -276,7 +274,7 @@ e2e-test-status:
   tags: ["arch:amd64"]
   timeout: 3h
   rules:
-    - if: $SKIP_E2E_TESTS
+    - if: '$SKIP_E2E_TESTS == true'
       when: never
     - when: on_success
   script: |

From 62f63e9cbf340b67e00187e8e3786a7d5165c88f Mon Sep 17 00:00:00 2001
From: Rithika Narayan <rithika.narayan@datadoghq.com>
Date: Tue, 16 Dec 2025 14:24:06 -0500
Subject: [PATCH 15/15] make variable a string

---
 .gitlab-ci.yml                | 2 +-
 ci/input_files/build.yaml.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b393f083..417398ec4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  SKIP_E2E_TESTS: false
+  SKIP_E2E_TESTS: "false"
 
 stages:
   - pre 
diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 603dca4c5..10ff9984a 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -142,7 +142,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10-py3
   rules:
-    - if: '$SKIP_E2E_TESTS == true'
+    - if: '$SKIP_E2E_TESTS == "true"'
       when: never
     - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
       when: on_success
@@ -250,7 +250,7 @@ e2e-test:
     project: DataDog/serverless-e2e-tests
     strategy: depend
   rules:
-    - if: '$SKIP_E2E_TESTS == true'
+    - if: '$SKIP_E2E_TESTS == "true"'
       when: never
     - when: on_success
   variables:
@@ -274,7 +274,7 @@ e2e-test-status:
   tags: ["arch:amd64"]
   timeout: 3h
   rules:
-    - if: '$SKIP_E2E_TESTS == true'
+    - if: '$SKIP_E2E_TESTS == "true"'
       when: never
     - when: on_success
   script: |