Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:

ci image:
stage: build
image: registry.ddbuild.io/images/docker:20.10
image: registry.ddbuild.io/images/docker:20.10.13-jammy
tags: ["arch:arm64"]
id_tokens:
DDSIGN_ID_TOKEN:
Expand Down Expand Up @@ -55,3 +55,10 @@ build-layers:
strategy: depend
rules:
- when: on_success

validate-ci-builder:
stage: pre
image: registry.ddbuild.io/images/docker:20.10.13-jammy
tags: ["arch:amd64"]
script:
- docker buildx version
23 changes: 22 additions & 1 deletion .gitlab/input_files/build.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ publish layer {{ $environment.name }} ({{ $runtime.name }}):
tags: ["arch:amd64"]
image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
rules:
# Image maintenance cannot deploy Lambda layers or services.
- if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//'
when: never
- if: '"{{ $environment.name }}" == "sandbox" && $REGION == "{{ $e2e_region }}"'
when: on_success
- if: '"{{ $environment.name }}" =~ /^(sandbox|staging)/'
Expand Down Expand Up @@ -230,6 +233,11 @@ publish npm package:

e2e-test:
stage: e2e
rules:
# Image maintenance cannot deploy Lambda layers or services.
- if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//'
when: never
- when: on_success
trigger:
project: DataDog/serverless-e2e-tests
strategy: depend
Expand All @@ -246,8 +254,21 @@ e2e-test:

e2e-test-status:
stage: e2e
image: registry.ddbuild.io/images/docker:20.10-py3
rules:
# Image maintenance cannot deploy Lambda layers or services.
- if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//'
when: never
- when: on_success
image: registry.ddbuild.io/images/docker:v152575203-37c9356-20.10-py3-buildx-0382@sha256:f3a52d7dd87121dec7f09f3321e2ddf7c84b127dceaabe645ba612f4f4c81887
tags: ["arch:amd64"]
timeout: 3h
script:
- .gitlab/scripts/poll_e2e.sh

validate-python-ci-tools:
stage: test
image: registry.ddbuild.io/images/docker:v152575203-37c9356-20.10-py3-buildx-0382@sha256:f3a52d7dd87121dec7f09f3321e2ddf7c84b127dceaabe645ba612f4f4c81887
tags: ["arch:amd64"]
script:
- python3 --version
- docker buildx version | grep -F "github.com/docker/buildx v0.38.2-dd.3 "
Loading