Skip to content

[CIEXE-2016] Migrate GitLab CI generators to pod-level resource variables #4019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
henryvo117 wants to merge 3 commits into
base: master
Choose a base branch
from
+172 −165
Draft

[CIEXE-2016] Migrate GitLab CI generators to pod-level resource variables #4019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c15ee6
[CIEXE-2016] Migrate GitLab CI jobs to pod-level resource variables
henryvo117 Jun 26, 2026
04f03b7
[CIEXE-2016] Account for service container resources in pod-level budget
henryvo117 Jun 26, 2026
c7147f9
[CIEXE-2016] Fix pod resource budgets to satisfy pod-level scheduling…
henryvo117 Jun 26, 2026
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
72 changes: 34 additions & 38 deletions .gitlab/generate-appsec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,10 @@
extends: .appsec_test
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_CPU_LIMIT: 3
KUBERNETES_MEMORY_REQUEST: 6Gi
KUBERNETES_MEMORY_LIMIT: 6Gi
KUBERNETES_HELPER_CPU_REQUEST: 1
KUBERNETES_HELPER_CPU_LIMIT: 1
KUBERNETES_HELPER_MEMORY_REQUEST: 3Gi
KUBERNETES_HELPER_MEMORY_LIMIT: 3Gi
KUBERNETES_POD_CPU_REQUEST: 3
KUBERNETES_POD_CPU_LIMIT: 3
KUBERNETES_POD_MEMORY_REQUEST: 6Gi
KUBERNETES_POD_MEMORY_LIMIT: 6Gi
parallel:
matrix:
- PHP_MAJOR_MINOR: *all_minor_major_targets
Expand All @@ -107,9 +103,9 @@
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble # TODO: use a proper docker image with java pre-installed?
tags: [ "docker-in-docker:amd64" ]
variables:
KUBERNETES_CPU_REQUEST: 8
KUBERNETES_MEMORY_REQUEST: 24Gi
KUBERNETES_MEMORY_LIMIT: 30Gi
KUBERNETES_POD_CPU_REQUEST: 8
KUBERNETES_POD_MEMORY_REQUEST: 24Gi
KUBERNETES_POD_MEMORY_LIMIT: 52Gi
DOCKER_LOOPBACK_SIZE: 30G
ARCH: amd64
HELPER_FLAG: ""
Expand Down Expand Up @@ -203,9 +199,9 @@
interruptible: false
- when: on_success
variables:
KUBERNETES_CPU_REQUEST: 4
KUBERNETES_MEMORY_REQUEST: 8Gi
KUBERNETES_MEMORY_LIMIT: 10Gi
KUBERNETES_POD_CPU_REQUEST: 4
KUBERNETES_POD_MEMORY_REQUEST: 8Gi
KUBERNETES_POD_MEMORY_LIMIT: 52Gi
ARCH: amd64
before_script:
<?php echo $ecrLoginSnippet, "\n"; ?>
Expand Down Expand Up @@ -238,9 +234,9 @@
interruptible: false
- when: on_success
variables:
KUBERNETES_CPU_REQUEST: 4
KUBERNETES_MEMORY_REQUEST: 8Gi
KUBERNETES_MEMORY_LIMIT: 10Gi
KUBERNETES_POD_CPU_REQUEST: 4
KUBERNETES_POD_MEMORY_REQUEST: 8Gi
KUBERNETES_POD_MEMORY_LIMIT: 52Gi
ARCH: amd64
before_script:
<?php echo $ecrLoginSnippet, "\n"; ?>
Expand Down Expand Up @@ -312,9 +308,9 @@
interruptible: false
- when: on_success
variables:
KUBERNETES_CPU_REQUEST: 8
KUBERNETES_MEMORY_REQUEST: 24Gi
KUBERNETES_MEMORY_LIMIT: 30Gi
KUBERNETES_POD_CPU_REQUEST: 8
KUBERNETES_POD_MEMORY_REQUEST: 24Gi
KUBERNETES_POD_MEMORY_LIMIT: 52Gi
ARCH: amd64
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0"
before_script:
Expand Down Expand Up @@ -394,9 +390,9 @@
extends: .appsec_test
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-8
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 3Gi
KUBERNETES_MEMORY_LIMIT: 4Gi
KUBERNETES_POD_CPU_REQUEST: 3
KUBERNETES_POD_MEMORY_REQUEST: 3Gi
KUBERNETES_POD_MEMORY_LIMIT: 4Gi
ARCH: amd64
script:
- |
Expand Down Expand Up @@ -481,9 +477,9 @@
extends: .docker_push_job
tags: [ "docker-in-docker:${ARCH}" ]
variables:
KUBERNETES_CPU_REQUEST: 8
KUBERNETES_MEMORY_REQUEST: 16Gi
KUBERNETES_MEMORY_LIMIT: 24Gi
KUBERNETES_POD_CPU_REQUEST: 8
KUBERNETES_POD_MEMORY_REQUEST: 16Gi
KUBERNETES_POD_MEMORY_LIMIT: 24Gi
parallel:
matrix:
# XXX: docker-in-docker:arm64 is not supported yet
Expand All @@ -499,9 +495,9 @@
"push appsec docker images multiarch":
extends: .docker_push_job
variables:
KUBERNETES_CPU_REQUEST: 2
KUBERNETES_MEMORY_REQUEST: 4Gi
KUBERNETES_MEMORY_LIMIT: 6Gi
KUBERNETES_POD_CPU_REQUEST: 2
KUBERNETES_POD_MEMORY_REQUEST: 4Gi
KUBERNETES_POD_MEMORY_LIMIT: 6Gi
ARCH: amd64
rules:
- when: on_success
Expand All @@ -516,9 +512,9 @@
extends: .appsec_test
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-8
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 9Gi
KUBERNETES_MEMORY_LIMIT: 10Gi
KUBERNETES_POD_CPU_REQUEST: 3
KUBERNETES_POD_MEMORY_REQUEST: 9Gi
KUBERNETES_POD_MEMORY_LIMIT: 10Gi
ARCH: amd64
script:
- sudo apt install -y clang-format-20
Expand All @@ -538,9 +534,9 @@
extends: .appsec_test
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-8
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 3Gi
KUBERNETES_MEMORY_LIMIT: 4Gi
KUBERNETES_POD_CPU_REQUEST: 3
KUBERNETES_POD_MEMORY_REQUEST: 3Gi
KUBERNETES_POD_MEMORY_LIMIT: 4Gi
parallel:
matrix:
- ARCH: *arch_targets
Expand All @@ -564,9 +560,9 @@
# extends: .appsec_test
# image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-8
# variables:
# KUBERNETES_CPU_REQUEST: 3
# KUBERNETES_MEMORY_REQUEST: 5Gi
# KUBERNETES_MEMORY_LIMIT: 6Gi
# KUBERNETES_POD_CPU_REQUEST: 3
# KUBERNETES_POD_MEMORY_REQUEST: 5Gi
# KUBERNETES_POD_MEMORY_LIMIT: 6Gi
# parallel:
# matrix:
# - ARCH: *arch_targets
Expand Down
8 changes: 0 additions & 8 deletions .gitlab/generate-common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,21 +221,13 @@ function windows_git_setup_with_packages() {
DD_POOL_TRACE_CHECK_FAILURES: true
DD_DISABLE_ERROR_RESPONSES: true
SNAPSHOT_REGEX_PLACEHOLDERS: 'path:/\S+/dd-trace-php(?=/),httpbin:(?<=//)httpbin-integration:8080'
KUBERNETES_SERVICE_CPU_REQUEST: 1
KUBERNETES_SERVICE_CPU_LIMIT: 1
KUBERNETES_SERVICE_MEMORY_REQUEST: 512Mi
KUBERNETES_SERVICE_MEMORY_LIMIT: 512Mi

request-replayer:
name: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-request-replayer-2.0
alias: request-replayer
command: ["php", "-S", "<?= $service_bind_address ?>:80", "index.php"]
variables:
DD_REQUEST_DUMPER_FILE: dump.json
KUBERNETES_SERVICE_CPU_REQUEST: 2
KUBERNETES_SERVICE_CPU_LIMIT: 2
KUBERNETES_SERVICE_MEMORY_REQUEST: 1Gi
KUBERNETES_SERVICE_MEMORY_LIMIT: 1Gi

httpbin-integration:
name: registry.ddbuild.io/images/mirror/kong/httpbin:0.2.2
Expand Down
Loading
Loading