Skip to content

Commit c8555e9

Browse files
Use skip e2e tests global variable
1 parent 93d9191 commit c8555e9

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
variables:
2+
SKIP_E2E_TESTS: false
3+
14
stages:
25
- pre
36
- build

ci/input_files/build.yaml.tpl

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
111111
tags: ["arch:amd64"]
112112
image: registry.ddbuild.io/images/docker:20.10-py3
113113
rules:
114-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
115-
when: never
116114
- if: '$CI_COMMIT_TAG =~ /^v.*/'
117115
when: manual
118116
needs:
@@ -144,7 +142,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
144142
tags: ["arch:amd64"]
145143
image: registry.ddbuild.io/images/docker:20.10-py3
146144
rules:
147-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
145+
- if: $SKIP_E2E_TESTS
148146
when: never
149147
- if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
150148
when: on_success
@@ -192,7 +190,7 @@ publish-pypi-package:
192190
before_script: *python-before-script
193191
cache: []
194192
rules:
195-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
193+
- if: $SKIP_E2E_TESTS
196194
when: never
197195
- if: '$CI_COMMIT_TAG =~ /^v.*/'
198196
when: manual
@@ -206,10 +204,6 @@ layer bundle:
206204
stage: build
207205
tags: ["arch:amd64"]
208206
image: registry.ddbuild.io/images/docker:20.10
209-
rules:
210-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
211-
when: never
212-
- when: on_success
213207
needs:
214208
{{ range (ds "runtimes").runtimes }}
215209
- build-layer ({{ .name }}-{{ .arch }})
@@ -233,8 +227,6 @@ signed layer bundle:
233227
image: registry.ddbuild.io/images/docker:20.10-py3
234228
tags: ["arch:amd64"]
235229
rules:
236-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
237-
when: never
238230
- if: '$CI_COMMIT_TAG =~ /^v.*/'
239231
needs:
240232
{{ range (ds "runtimes").runtimes }}
@@ -260,7 +252,7 @@ e2e-test:
260252
project: DataDog/serverless-e2e-tests
261253
strategy: depend
262254
rules:
263-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
255+
- if: $SKIP_E2E_TESTS
264256
when: never
265257
- when: on_success
266258
variables:
@@ -284,7 +276,7 @@ e2e-test-status:
284276
tags: ["arch:amd64"]
285277
timeout: 3h
286278
rules:
287-
- if: $UPSTREAM_PROJECT_NAME == "dd-trace-py"
279+
- if: $SKIP_E2E_TESTS
288280
when: never
289281
- when: on_success
290282
script: |

0 commit comments

Comments
 (0)