Merge branch 'main' into kserrania/k8s-migration-unit-tests

.copyright-overrides.yml

@@ -131,6 +131,24 @@ github.com/google/go-containerregistry:
  - "Copyright 2020 Google LLC All Rights Reserved."
  - "Copyright 2021 Google LLC All Rights Reserved."
  - "Copyright 2022 Google LLC All Rights Reserved."
+github.com/google/go-containerregistry/internal/compression:
+ - "Copyright 2018 Google LLC All Rights Reserved."
+ - "Copyright 2019 Google LLC All Rights Reserved."
+ - "Copyright 2020 Google LLC All Rights Reserved."
+ - "Copyright 2021 Google LLC All Rights Reserved."
+ - "Copyright 2022 Google LLC All Rights Reserved."
+github.com/google/go-containerregistry/internal/zstd:
+ - "Copyright 2018 Google LLC All Rights Reserved."
+ - "Copyright 2019 Google LLC All Rights Reserved."
+ - "Copyright 2020 Google LLC All Rights Reserved."
+ - "Copyright 2021 Google LLC All Rights Reserved."
+ - "Copyright 2022 Google LLC All Rights Reserved."
+github.com/google/go-containerregistry/pkg/compression:
+ - "Copyright 2018 Google LLC All Rights Reserved."
+ - "Copyright 2019 Google LLC All Rights Reserved."
+ - "Copyright 2020 Google LLC All Rights Reserved."
+ - "Copyright 2021 Google LLC All Rights Reserved."
+ - "Copyright 2022 Google LLC All Rights Reserved."
 github.com/google/licenseclassifier/v2:
  - "Copyright 2017 Google LLC All Rights Reserved."
  - "Copyright 2020 Google LLC All Rights Reserved."
@@ -184,29 +202,35 @@ github.com/aquasecurity/go-version: Copyright (c) 2020 Teppei Fukuda (knqyf263)
 github.com/spdx/tools-golang: Copyright (c) 2018 The Authors
 github.com/google/flatbuffers: Copyright (c) 2014 Google
 
-# FIXME(AP-2060): inv generate-licenses and inv lint-licenses can generate invalid csv
-# while parsing some files. For instance, in the README.md of github.com/klauspost/compress/s2,
-# there is an example section which contains:
-#    // We are only interested in the contents.
-#    // Assume that files start with "// Copyright (c) 2023".
-#    // Search for the longest match for that.
-#    // This may save a few bytes.
-#    dict := s2.MakeDict(insp.Content(), []byte("// Copyright (c) 2023"))
-# This causes the tasks to add 'Copyright (c) 2023". | Copyright (c) 2023"))' to the copyright
-# information for that file, resulting in an invalid csv (due to the quotes).
-# Until this is fixed, override the copyright value to avoid parsing these files.
-github.com/klauspost/compress/s2:
-  - "Copyright (c) 2011 The Snappy-Go Authors. All rights reserved"
-  - "Copyright (c) 2012 The Go Authors. All rights reserved"
-  - "Copyright (c) 2015 Klaus Post"
-  - "Copyright (c) 2019 Klaus Post. All rights reserved"
-  - "Copyright 2016 The filepathx Authors"
-  - "Copyright 2016-2017 The New York Times Company"
-
 # The Copyright information is not contained in the LICENSE file, but it can be found in other
 # files in the package, such as:
 #  * https://github.com/godror/knownpb/blob/main/timestamppb/timestamp_test.go
 #  * https://github.com/godror/knownpb/blob/main/timestamppb/timestamp.go
 #  * https://github.com/godror/knownpb/blob/main/internal/writer.go 
 github.com/godror/knownpb/internal: Copyright 2014, 2021 Tamás Gulácsi
 github.com/godror/knownpb/timestamppb: Copyright 2019, 2021 Tamás Gulácsi
+
+
+github.com/google/s2a-go: Copyright (c) 2020 Google
+github.com/google/s2a-go/fallback: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/authinfo: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/handshaker: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/handshaker/service: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/common_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/s2a_context_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/s2a_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/v2/common_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/v2/s2a_context_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/proto/v2/s2a_go_proto: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/record: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/record/internal/aeadcrypter: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/record/internal/halfconn: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/tokenmanager: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/v2: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/v2/certverifier: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/v2/remotesigner: Copyright (c) 2020 Google
+github.com/google/s2a-go/internal/v2/tlsconfigstore: Copyright (c) 2020 Google
+github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v1: Copyright 2018 New York University
+go.opentelemetry.io/otel/semconv/internal: Copyright The OpenTelemetry Authors
+go.opentelemetry.io/otel/semconv/v1.12.0: Copyright The OpenTelemetry Authors
+golang.org/x/crypto/chacha20poly1305: Copyright (c) 2009 The Go Authors. All rights reserved

.git-blame-ignore-revs

@@ -1,2 +1,2 @@
 # removed old // +build go build constraints
-e627edf360ef6ce2eeb58e760073bfe2e73a65a6
+5eb542ef374c942a1ca9c4fff9f2511b89a5145e

.github/CODEOWNERS

@@ -116,10 +116,15 @@
 /cmd/agent/subcommands/workloadlist     @DataDog/container-integrations
 /cmd/agent/subcommands/run/internal/clcrunnerapi/       @DataDog/container-integrations @DataDog/agent-shared-components
 /cmd/agent/windows                      @DataDog/windows-agent
-/cmd/agent/dist/conf.d/jetson.d         @DataDog/agent-platform
-/cmd/agent/dist/conf.d/oracle-dbm.d     @DataDog/database-monitoring
-/cmd/agent/dist/conf.d/snmp.d/          @DataDog/network-device-monitoring
+/cmd/agent/dist/conf.d/container.d/     @DataDog/container-integrations
+/cmd/agent/dist/conf.d/containerd.d/    @DataDog/container-integrations
+/cmd/agent/dist/conf.d/container_image.d/      @DataDog/container-integrations
+/cmd/agent/dist/conf.d/container_lifecycle.d/  @DataDog/container-integrations
+/cmd/agent/dist/conf.d/jetson.d/        @DataDog/agent-platform
+/cmd/agent/dist/conf.d/oracle-dbm.d/    @DataDog/database-monitoring
 /cmd/agent/dist/conf.d/oracle-dbm.d/conf.yaml.default @DataDog/database-monitoring
+/cmd/agent/dist/conf.d/sbom.d/          @DataDog/container-integrations
+/cmd/agent/dist/conf.d/snmp.d/          @DataDog/network-device-monitoring
 /cmd/agent/*.manifest                   @DataDog/agent-platform
 /cmd/agent/*.mc                         @DataDog/agent-platform
 /cmd/agent/*.rc                         @DataDog/agent-platform
@@ -135,6 +140,9 @@
 /cmd/serverless/                        @DataDog/serverless
 /cmd/serverless-init/                   @DataDog/serverless
 /cmd/system-probe/                      @DataDog/ebpf-platform
+/cmd/system-probe/config/adjust_npm.go  @DataDog/ebpf-platform @DataDog/Networks
+/cmd/system-probe/config/adjust_usm.go  @DataDog/ebpf-platform @DataDog/universal-service-monitoring
+/cmd/system-probe/config/adjust_security.go  @DataDog/ebpf-platform @DataDog/agent-security
 /cmd/system-probe/modules/network_tracer*   @DataDog/Networks
 /cmd/system-probe/modules/oom_kill_probe*   @DataDog/container-integrations
 /cmd/system-probe/modules/process*      @DataDog/processes
@@ -262,6 +270,8 @@
 /pkg/epforwarder/                       @DataDog/agent-shared-components @DataDog/agent-metrics-logs
 /pkg/flare/                             @DataDog/agent-shared-components
 /pkg/otlp/                              @DataDog/opentelemetry
+/pkg/otlp/*_serverless*.go              @DataDog/serverless
+/pkg/otlp/*_not_serverless*.go          @DataDog/opentelemetry
 /pkg/pidfile/                           @DataDog/agent-shared-components
 /pkg/persistentcache/                   @DataDog/agent-metrics-logs
 /pkg/proto/                             @DataDog/agent-shared-components
@@ -289,6 +299,7 @@
 /pkg/util/retry/                        @DataDog/container-integrations
 /pkg/util/intern/                       @DataDog/ebpf-platform
 /pkg/util/winutil/                      @DataDog/windows-agent
+/pkg/languagedetection                  @DataDog/processes @DataDog/universal-service-monitoring
 /pkg/logs/                              @DataDog/agent-metrics-logs
 /pkg/process/                           @DataDog/processes
 /pkg/process/util/address*.go           @DataDog/Networks

.gitlab-ci.yml

@@ -148,15 +148,15 @@ variables:
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only"
   DATADOG_AGENT_BUILDIMAGES: v15830939-045ac73
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v15555630-10b9e4c
+  DATADOG_AGENT_WINBUILDIMAGES: v16026304-782441d
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
   DATADOG_AGENT_ARMBUILDIMAGES: v15830939-045ac73
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v15555630-10b9e4c
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v16026304-782441d
   DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_NIKOS_BUILDIMAGES: v15555630-10b9e4c
+  DATADOG_AGENT_NIKOS_BUILDIMAGES: v16026304-782441d
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v15555630-10b9e4c
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v16026304-782441d
   DATADOG_AGENT_BUILDERS: v9930706-ef9d493
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.gitlab/binary_build/windows.yml

@@ -13,7 +13,7 @@ build_windows_container_entrypoint:
     - if (Test-Path build-out) { remove-item -recurse -force build-out }
     - >
       docker run --rm
-      -m 4096M
+      -m 8192M
       -v "$(Get-Location):c:\mnt"
       -e CI_JOB_ID=${CI_JOB_ID}
       -e WINDOWS_BUILDER=true

.gitlab/deploy_6/container.yml

@@ -15,7 +15,7 @@
   dependencies: []
   before_script:
     - source /root/.bashrc
-    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv -e agent.version --major-version 6 --url-safe)"; fi
+    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv agent.version --major-version 6 --url-safe)"; fi
     - export IMG_SOURCES="${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6${JMX}-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6${JMX}-arm64"
     - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
   parallel:

.gitlab/deploy_7/container.yml

@@ -15,7 +15,7 @@
   dependencies: []
   before_script:
     - source /root/.bashrc
-    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv -e agent.version --major-version 7 --url-safe)"; fi
+    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv agent.version --major-version 7 --url-safe)"; fi
     - export IMG_BASE_SRC="${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
     - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
     - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${SERVERCORE}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${SERVERCORE}-amd64"
@@ -57,7 +57,7 @@ deploy_containers-dogstatsd:
   dependencies: []
   before_script:
     - source /root/.bashrc
-    - export VERSION="$(inv -e agent.version --major-version 7 --url-safe)"
+    - export VERSION="$(inv agent.version --major-version 7 --url-safe)"
     - export IMG_SOURCES="${SRC_DSD}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-amd64,${SRC_DSD}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-arm64"
     - export IMG_DESTINATIONS="${DSD_REPOSITORY}:${VERSION}"
 

.gitlab/deploy_dca.yml

@@ -15,7 +15,7 @@
   dependencies: []
   before_script:
     - source /root/.bashrc
-    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv -e agent.version --major-version 7 --url-safe)"; fi
+    - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv agent.version --major-version 7 --url-safe)"; fi
     - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent"; fi
     - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
     - export IMG_SOURCES="${IMG_BASE_SRC}-amd64,${IMG_BASE_SRC}-arm64"

.gitlab/deps_build.yml

@@ -98,7 +98,7 @@ build_vcpkg_deps:
     - if (Test-Path build-out) { remove-item -recurse -force build-out }
     - >
       docker run --rm
-      -m 4096M
+      -m 8192M
       -v "$(Get-Location):c:\mnt"
       -e VCPKG_BINARY_SOURCES="clear;x-azblob,${vcpkgBlobSaSUrl},readwrite"
       486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}${Env:DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${Env:DATADOG_AGENT_WINBUILDIMAGES}

.gitlab/e2e.yml

@@ -47,15 +47,15 @@ k8s-e2e-tags-6:
   extends: .k8s_e2e_template
   rules: !reference [.on_deploy_stable_or_beta_repo_branch_a6_manual]
   script:
-    - AGENT_VERSION=$(inv -e agent.version --major-version 6)
+    - AGENT_VERSION=$(inv agent.version --major-version 6)
     - DCA_VERSION=$(inv -e cluster-agent.version)
     - inv -e e2e-tests --agent-image=datadog/agent:${AGENT_VERSION} --dca-image=datadog/cluster-agent:${DCA_VERSION} --argo-workflow=default
 
 k8s-e2e-tags-7:
   extends: .k8s_e2e_template
   rules: !reference [.on_deploy_stable_or_beta_repo_branch_a7_manual]
   script:
-    - AGENT_VERSION=$(inv -e agent.version --major-version 7)
+    - AGENT_VERSION=$(inv agent.version --major-version 7)
     - DCA_VERSION=$(inv -e cluster-agent.version)
     - inv -e e2e-tests --agent-image=datadog/agent:${AGENT_VERSION} --dca-image=datadog/cluster-agent:${DCA_VERSION} --argo-workflow=default
 

.gitlab/functional_test/regression_detector.yml

@@ -9,6 +9,7 @@ single-machine-performance-regression_detector:
     expire_in: 1 weeks
     paths:
       - submission_metadata
+    when: always
   variables:
     SMP_VERSION: 0.7.3
     LADING_VERSION: 0.14.0

.gitlab/functional_test/security_agent.yml

@@ -91,7 +91,7 @@ kitchen_test_security_agent_arm64:
     matrix:
       - KITCHEN_PLATFORM: "ubuntu"
         KITCHEN_OSVERS: "ubuntu-20-04-2,ubuntu-22-04"
-        KITCHEN_CWS_PLATFORM: [host, docker]
+        KITCHEN_CWS_PLATFORM: [host, docker, ad]
 
 kitchen_test_security_agent_amazonlinux_x64:
   extends:

.gitlab/functional_test/system_probe.yml

@@ -12,6 +12,7 @@
   rules:
     !reference [.on_system_probe_changes_or_manual]
   stage: functional_test
+  timeout: 3h
   variables:
     AGENT_MAJOR_VERSION: 7
     DD_PIPELINE_ID: $CI_PIPELINE_ID-fnct
@@ -37,6 +38,21 @@
   - $S3_CP_CMD $S3_ARTIFACTS_URI/minimized-btfs-${ARCH}.tar.xz /tmp/minimized-btfs.tar.xz
   - cp /tmp/minimized-btfs.tar.xz $DD_AGENT_TESTING_DIR/site-cookbooks/dd-system-probe-check/files/minimized-btfs.tar.xz
 
+# This dummy job is added here because we want the functional_tests stage to start at the same time as kernel_matrix_testing stage.
+# The ebpf-platform team is trying to measure the time from the start of the pipeline to the completion of the kernel_matrix_testing and functional_tests stages, to measure improvement.
+# The CI visibility product currently does not provide a way to measure this in the datadog app.
+# We are trying to hack around this by having jobs which are triggered at the start of a pipeline.
+# For functional tests this is the 'kitchen_test_dummy_job_tmp' and for kernel_matrix_testing it is the 'pull_test_dockers*' jobs.
+# This way the stage.duration metric will allow us to measure what we want.
+# This will most likely be temporary, until we decide which approach to move forward with for testing in the future.
+kitchen_test_dummy_job_tmp:
+  stage: functional_test
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/btf-gen$DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BTF_GEN_BUILDIMAGES
+  needs: []
+  tags: ["runner:main"]
+  script:
+    - 'true'
+
 kitchen_test_system_probe_linux_x64_ec2:
   extends:
     - .kitchen_test_system_probe
@@ -58,24 +74,50 @@ kitchen_test_system_probe_linux_x64_ec2:
   parallel:
     matrix:
       - KITCHEN_PLATFORM: "amazonlinux"
-        KITCHEN_OSVERS: "amazonlinux2-4-14,amazonlinux2-5-10,amazonlinux2022-5-15"
+        KITCHEN_OSVERS: "amazonlinux2-4-14"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2-5-10"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2022-5-15"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2023"
+      - KITCHEN_PLATFORM: "centos"
+        KITCHEN_OSVERS: "centos-79"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
       - KITCHEN_PLATFORM: "centos"
-        KITCHEN_OSVERS: "centos-79,rhel-86"
+        KITCHEN_OSVERS: "rhel-86"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
+      - KITCHEN_PLATFORM: "debian"
+        KITCHEN_OSVERS: "debian-10"
+      - KITCHEN_PLATFORM: "debian"
+        KITCHEN_OSVERS: "debian-11"
+      - KITCHEN_PLATFORM: "fedora"
+        KITCHEN_OSVERS: "fedora-36"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
+      - KITCHEN_PLATFORM: "fedora"
+        KITCHEN_OSVERS: "fedora-37"
         KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
       - KITCHEN_PLATFORM: "ubuntu"
         KITCHEN_OSVERS: "ubuntu-16-04-4.4"
         KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
       - KITCHEN_PLATFORM: "ubuntu"
-        KITCHEN_OSVERS: "ubuntu-16-04,ubuntu-18-04,ubuntu-20-04,ubuntu-22-04"
+        KITCHEN_OSVERS: "ubuntu-16-04"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-18-04"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-20-04"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-22-04"
         KITCHEN_EC2_DEVICE_NAME: "/dev/sda1"
-      - KITCHEN_PLATFORM: "debian"
-        KITCHEN_OSVERS: "debian-10,debian-11"
 
 kitchen_test_system_probe_linux_arm64:
   extends:
     - .kitchen_test_system_probe
     - .kitchen_ec2_location_us_east_1
-    - .kitchen_ec2_spot_instances
+    - .kitchen_ec2
   needs: [ "tests_ebpf_arm64", "prepare_ebpf_functional_tests_arm64", "generate_minimized_btfs_arm64", "pull_test_dockers_arm64" ]
   variables:
     ARCH: arm64
@@ -91,16 +133,38 @@ kitchen_test_system_probe_linux_arm64:
     - tasks/kitchen_setup.sh
   parallel:
     matrix:
-      - KITCHEN_PLATFORM: "ubuntu"
-        KITCHEN_OSVERS: "ubuntu-18-04,ubuntu-20-04,ubuntu-22-04"
-      - KITCHEN_PLATFORM: "debian"
-        KITCHEN_OSVERS: "debian-10,debian-11"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2-4-14"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2-5-10"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
+      - KITCHEN_PLATFORM: "amazonlinux"
+        KITCHEN_OSVERS: "amazonlinux2022-5-15"
         KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
-      - KITCHEN_PLATFORM: "centos"
-        KITCHEN_OSVERS: "centos-79,rhel-86"
       - KITCHEN_PLATFORM: "amazonlinux"
-        KITCHEN_OSVERS: "amazonlinux2-4-14,amazonlinux2-5-10,amazonlinux2022-5-15"
+        KITCHEN_OSVERS: "amazonlinux2023"
         KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
+      - KITCHEN_PLATFORM: "centos"
+        KITCHEN_OSVERS: "centos-79"
+      - KITCHEN_PLATFORM: "centos"
+        KITCHEN_OSVERS: "rhel-86"
+      - KITCHEN_PLATFORM: "debian"
+        KITCHEN_OSVERS: "debian-10"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
+      - KITCHEN_PLATFORM: "debian"
+        KITCHEN_OSVERS: "debian-11"
+        KITCHEN_EC2_DEVICE_NAME: "/dev/xvda"
+      - KITCHEN_PLATFORM: "fedora"
+        KITCHEN_OSVERS: "fedora-36"
+      - KITCHEN_PLATFORM: "fedora"
+        KITCHEN_OSVERS: "fedora-37"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-18-04"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-20-04"
+      - KITCHEN_PLATFORM: "ubuntu"
+        KITCHEN_OSVERS: "ubuntu-22-04"
 
 kitchen_test_system_probe_windows_x64:
   extends:

.gitlab/kitchen_cleanup.yml

@@ -8,24 +8,6 @@
 # include:
 #   - /.gitlab/kitchen_common/cleanup.yml
 
-kitchen_cleanup_s3-a6:
-  extends: .kitchen_cleanup_s3_common
-  rules:
-    !reference [.on_kitchen_tests_a6]
-  dependencies: ["agent_deb-x64-a6", "agent_heroku_deb-x64-a6"]
-  variables:
-    AGENT_MAJOR_VERSION: 6
-    DD_PIPELINE_ID: $CI_PIPELINE_ID-a6
-
-kitchen_cleanup_s3-a7:
-  extends: .kitchen_cleanup_s3_common
-  rules:
-    !reference [.on_default_kitchen_tests_a7]
-  dependencies: ["agent_deb-x64-a7", "agent_heroku_deb-x64-a7"]
-  variables:
-    AGENT_MAJOR_VERSION: 7
-    DD_PIPELINE_ID: $CI_PIPELINE_ID-a7
-
 kitchen_cleanup_azure-a6:
   extends: .kitchen_cleanup_azure_common
   rules: