Merge branch 'main' of github.com:DataDog/datadog-agent into pgimalac…

…/update-go-extended-libs

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v31694071-c6e811e7
+      - image: gcr.io/datadoghq/agent-circleci-runner:v31802788-2dee8fe9
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

.ddqa/config.toml

@@ -103,11 +103,11 @@ github_labels = ["team/platform-integrations"]
 exclude_members = ["hithwen"]
 
 [teams."APM"]
-jira_project = "AIT"
+jira_project = "APMSP"
 jira_component = "Trace Agent"
 jira_issue_type = "Task"
 jira_statuses = ["Backlog", "In Progress", "Done"]
-github_team = "apm-go"
+github_team = "agent-apm"
 github_labels = ["team/agent-apm"]
 
 [teams."Remote Config"]

.github/CODEOWNERS

@@ -326,7 +326,6 @@
 /pkg/collector/corechecks/ebpf/probe/ebpfcheck/       @DataDog/ebpf-platform
 /pkg/collector/corechecks/ebpf/c/runtime/ebpf*        @DataDog/ebpf-platform
 /pkg/collector/corechecks/embed/        @Datadog/agent-ci-experience
-/pkg/collector/corechecks/embed/jmx/    @Datadog/agent-metrics-logs
 /pkg/collector/corechecks/embed/apm/            @Datadog/agent-ci-experience @DataDog/agent-apm
 /pkg/collector/corechecks/embed/process/  @Datadog/agent-ci-experience @DataDog/processes
 /pkg/collector/corechecks/network-devices/         @DataDog/network-device-monitoring

.github/workflows/serverless-integration.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [amd64, arm64]
-        suite: [metric, trace, appsec, proxy]
+        suite: [metric, log, trace, appsec, proxy]
     name: ${{ matrix.suite }} on ${{ matrix.architecture }}
     steps:
       - name: Checkout datadog-agent repository

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 ---
 include:
   - .gitlab/.pre/cancel-prev-pipelines.yml
+  - .gitlab/.pre/test_gitlab_configuration.yml
   - .gitlab/benchmarks/include.yml
   - .gitlab/binary_build/include.yml
   - .gitlab/check_deploy/check_deploy.yml
@@ -138,7 +139,7 @@ variables:
   WINDOWS_TESTING_S3_BUCKET_A7: pipelines/A7/$CI_PIPELINE_ID
   WINDOWS_BUILDS_S3_BUCKET: $WIN_S3_BUCKET/builds
   DEB_RPM_TESTING_BUCKET_BRANCH: testing # branch of the DEB_TESTING_S3_BUCKET and RPM_TESTING_S3_BUCKET repos to release to, 'testing'
-  S3_CP_OPTIONS: --only-show-errors --region us-east-1 --sse AES256
+  S3_CP_OPTIONS: --no-progress --region us-east-1 --sse AES256
   S3_CP_CMD: aws s3 cp $S3_CP_OPTIONS
   S3_ARTIFACTS_URI: s3://dd-ci-artefacts-build-stable/$CI_PROJECT_NAME/$CI_PIPELINE_ID
   S3_PERMANENT_ARTIFACTS_URI: s3://dd-ci-persistent-artefacts-build-stable/$CI_PROJECT_NAME
@@ -162,19 +163,19 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_BUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_WINBUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_ARMBUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_NIKOS_BUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_NIKOS_BUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v31694071-c6e811e7
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v31802788-2dee8fe9
   DATADOG_AGENT_BUILDERS: v28719426-b6a4fd9
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
@@ -1029,3 +1030,12 @@ workflow:
       FAST_TESTS: "false"
   - variables:
       FAST_TESTS: "true"
+
+.on_gitlab_changes:
+  - !reference [.except_mergequeue]
+  - changes:
+      paths:
+        - .gitlab-ci.yml
+        - .gitlab/**/*
+      compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
+

.gitlab/.pre/test_gitlab_configuration.yml

@@ -0,0 +1,10 @@
+test_gitlab_configuration:
+  stage: .pre
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
+  tags: ["arch:amd64"]
+  rules:
+    - !reference [.on_gitlab_changes]
+  script:
+    - source /root/.bashrc
+    - export GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh $GITLAB_SCHEDULER_TOKEN_SSM_NAME)
+    - inv linter.gitlab-ci

.gitlab/common/test_infra_version.yml

@@ -4,4 +4,4 @@ variables:
   # and check the job creating the image to make sure you have the right SHA prefix
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
   # Make sure to update test-infra-definitions version in go.mod as well
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: e488596ad7f3
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: e2e7d263e05c

.gitlab/deploy_packages/deploy_common.yml

@@ -6,7 +6,7 @@
   before_script:
     - ls $OMNIBUS_PACKAGE_DIR
   script:
-    - $S3_CP_CMD --recursive --exclude "*" --include "*_${MAJOR_VERSION}.*${PACKAGE_ARCH}.deb" "$OMNIBUS_PACKAGE_DIR" "$S3_RELEASE_ARTIFACTS_URI/deb/${PACKAGE_ARCH}/" || true
+    - $S3_CP_CMD --recursive --exclude "*" --include "*_${MAJOR_VERSION}.*${PACKAGE_ARCH}.deb" "$OMNIBUS_PACKAGE_DIR" "$S3_RELEASE_ARTIFACTS_URI/deb/${PACKAGE_ARCH}/"
 
 .deploy_packages_deb-6:
   extends: .deploy_packages_deb
@@ -33,7 +33,7 @@
   before_script:
     - ls $OMNIBUS_PACKAGE_DIR
   script:
-    - $S3_CP_CMD --recursive --exclude "*" --include "*-${MAJOR_VERSION}.*${PACKAGE_ARCH}.rpm" "$OMNIBUS_PACKAGE_DIR" "$S3_RELEASE_ARTIFACTS_URI/${ARTIFACTS_PREFIX}rpm/${PACKAGE_ARCH}/" || true
+    - $S3_CP_CMD --recursive --exclude "*" --include "*-${MAJOR_VERSION}.*${PACKAGE_ARCH}.rpm" "$OMNIBUS_PACKAGE_DIR" "$S3_RELEASE_ARTIFACTS_URI/${ARTIFACTS_PREFIX}rpm/${PACKAGE_ARCH}/"
 
 .deploy_packages_rpm-6:
   extends: .deploy_packages_rpm

.gitlab/deploy_packages/nix.yml

@@ -190,7 +190,7 @@ deploy_packages_dmg-x64-a7:
   before_script:
     - ls $OMNIBUS_PACKAGE_DIR
   script:
-    - $S3_CP_CMD --recursive --exclude "*" --include "datadog-agent-7*.dmg" $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/dmg/x86_64/ || true
+    - $S3_CP_CMD --recursive --exclude "*" --include "datadog-agent-7*.dmg" $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/dmg/x86_64/
 
 # deploy dogstatsd x64, non-static binary to staging bucket
 deploy_staging_dsd:

.gitlab/deploy_packages/windows.yml

@@ -17,7 +17,7 @@ deploy_packages_windows-x64-6:
       --exclude "*"
       --include "datadog-agent-6*.msi"
       --include "datadog-agent-6*.debug.zip"
-      $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/msi/x86_64/ || true
+      $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/msi/x86_64/
 
 #
 # Agent v7
@@ -37,7 +37,7 @@ deploy_packages_windows-x64-7:
       --exclude "*"
       --include "datadog-agent-7*.msi"
       --include "datadog-agent-7*.debug.zip"
-      $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/msi/x86_64/ || true
+      $OMNIBUS_PACKAGE_DIR $S3_RELEASE_ARTIFACTS_URI/msi/x86_64/
 
 deploy_staging_windows_tags-7:
   rules:

.gitlab/e2e/e2e.yml

@@ -286,10 +286,10 @@ new-e2e-updater:
   rules:
     !reference [.on_updater_or_e2e_changes_or_manual]
   needs:
-    - deploy_deb_testing-u7_arm64
-    - deploy_deb_testing-u7_amd64
-    - deploy_rpm_testing-u7_arm64
-    - deploy_rpm_testing-u7_x64
+    - deploy_deb_testing-i7_arm64
+    - deploy_deb_testing-i7_amd64
+    - deploy_rpm_testing-i7_arm64
+    - deploy_rpm_testing-i7_x64
   variables:
     TARGETS: ./tests/updater
     TEAM: fleet

.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml

@@ -29,7 +29,7 @@ internal_kubernetes_deploy_experimental:
     OPTION_AUTOMATIC_ROLLOUT: "true"
     OPTION_PRE_SCRIPT: "patch-cluster-images-operator.sh env=all-staging ${CI_COMMIT_REF_SLUG}-jmx-${CI_COMMIT_SHORT_SHA} ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}"
     SKIP_PLAN_CHECK: "true"
-    EXPLICIT_WORKFLOWS: "//workflows:beta_builds.agents_nightly.publish"
+    EXPLICIT_WORKFLOWS: "//workflows:beta_builds.agents_nightly.staging-deploy.publish,//workflows:beta_builds.agents_nightly.staging-validate.publish,//workflows:beta_builds.agents_nightly.prod-wait-business-hours.publish,//workflows:beta_builds.agents_nightly.prod-deploy.publish,//workflows:beta_builds.agents_nightly.prod-validate.publish,//workflows:beta_builds.agents_nightly.publish-image-confirmation.publish"
     BUNDLE_VERSION_OVERRIDE: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
   script:
     - source /root/.bashrc

.gitlab/kitchen_deploy/kitchen_deploy.yml

@@ -40,8 +40,8 @@
 .deploy_deb_resource_group-a7: &deploy_deb_resource_group-a7
   resource_group: deploy_deb_a7
 
-.deploy_deb_resource_group-u7: &deploy_deb_resource_group-u7
-  resource_group: deploy_deb_u7
+.deploy_deb_resource_group-i7: &deploy_deb_resource_group-i7
+  resource_group: deploy_deb_i7
 
 .deploy_deb_testing-a6:
   stage: kitchen_deploy
@@ -54,13 +54,13 @@
     - source /root/.bashrc
     - ls $OMNIBUS_PACKAGE_DIR
 
-.deploy_deb_testing-u7:
+.deploy_deb_testing-i7:
   stage: kitchen_deploy
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
   tags: ["arch:amd64"]
-  <<: *deploy_deb_resource_group-u7
+  <<: *deploy_deb_resource_group-i7
   variables:
-    DD_PIPELINE_ID: $CI_PIPELINE_ID-u7
+    DD_PIPELINE_ID: $CI_PIPELINE_ID-i7
   before_script:
     - source /root/.bashrc
     - ls $OMNIBUS_PACKAGE_DIR
@@ -151,13 +151,13 @@ deploy_deb_testing-a7_arm64:
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-*_7*arm64.deb
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-signing-keys_${DD_PIPELINE_ID}.deb
 
-deploy_deb_testing-u7_amd64:
+deploy_deb_testing-i7_amd64:
   rules:
     - !reference [.except_no_tests_no_deploy]
     - !reference [.except_mergequeue]
     - when: on_success
   extends:
-    - .deploy_deb_testing-u7
+    - .deploy_deb_testing-i7
   needs: ["installer_deb-amd64", "lint_linux-x64"]
   script:
     - *setup_apt_signing_key
@@ -168,13 +168,13 @@ deploy_deb_testing-u7_amd64:
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-x86_64" -m 7 -b $DEB_TESTING_S3_BUCKET -a amd64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-installer*amd64.deb
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-x86_64" -m 7 -b $DEB_TESTING_S3_BUCKET -a amd64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-signing-keys_${DD_PIPELINE_ID}.deb
 
-deploy_deb_testing-u7_arm64:
+deploy_deb_testing-i7_arm64:
   rules:
     - !reference [.except_no_tests_no_deploy]
     - !reference [.except_mergequeue]
     - when: on_success
   extends:
-    - .deploy_deb_testing-u7
+    - .deploy_deb_testing-i7
   needs: ["installer_deb-arm64", "lint_linux-arm64"]
   script:
     - *setup_apt_signing_key
@@ -262,7 +262,7 @@ deploy_rpm_testing-a7_arm64:
     - set +x
     - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "testing/pipeline-$DD_PIPELINE_ID/7/aarch64/" -a "aarch64" --sign --metadata-signing-key $RPM_GPG_KEY_ID $OMNIBUS_PACKAGE_DIR/datadog-*-7.*aarch64.rpm
 
-.deploy_rpm_testing-u7:
+.deploy_rpm_testing-i7:
   stage: kitchen_deploy
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
   tags: ["arch:amd64"]
@@ -271,23 +271,23 @@ deploy_rpm_testing-a7_arm64:
     - !reference [.except_mergequeue]
     - when: on_success
   variables:
-    DD_PIPELINE_ID: $CI_PIPELINE_ID-u7
+    DD_PIPELINE_ID: $CI_PIPELINE_ID-i7
   before_script:
     - source /root/.bashrc
     - ls $OMNIBUS_PACKAGE_DIR
 
-deploy_rpm_testing-u7_arm64:
+deploy_rpm_testing-i7_arm64:
   extends:
-    - .deploy_rpm_testing-u7
+    - .deploy_rpm_testing-i7
   needs: ["installer_rpm-arm64", "lint_linux-arm64"]
   script:
     - *setup_rpm_signing_key
     - set +x # make sure we don't output the creds to the build log
     - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "testing/pipeline-$DD_PIPELINE_ID/7/aarch64/" -a "aarch64" --sign --metadata-signing-key $RPM_GPG_KEY_ID $OMNIBUS_PACKAGE_DIR/datadog-*-7.*aarch64.rpm
 
-deploy_rpm_testing-u7_x64:
+deploy_rpm_testing-i7_x64:
   extends:
-    - .deploy_rpm_testing-u7
+    - .deploy_rpm_testing-i7
   needs: ["installer_rpm-amd64", "lint_linux-x64"]
   script:
     - *setup_rpm_signing_key

.gitlab/kitchen_testing/new-e2e_testing/windows.yml

@@ -43,6 +43,7 @@
       - E2E_MSI_TEST: TestSubServicesOpts/all-subservices
       - E2E_MSI_TEST: TestSubServicesOpts/no-subservices
       - E2E_MSI_TEST: TestInstallAltDir
+      - E2E_MSI_TEST: TestInstallFail
 
 # Agent 6
 .new-e2e_windows_a6_x86_64:

.gitlab/kitchen_testing/windows.yml

@@ -148,14 +148,6 @@ kitchen_windows_installer_npm_install_scenarios-a7:
     - .kitchen_scenario_windows_a7
     - .kitchen_test_windows_installer_npm
 
-kitchen_windows_installer_npm_driver-a7:
-  # Run NPM driver installer test on branches, on a reduced number of platforms
-  rules:
-    !reference [.on_default_kitchen_tests]
-  extends:
-    - .kitchen_scenario_windows_a7
-    - .kitchen_test_windows_installer_driver
-
 kitchen_windows_installer_agent-a6:
   extends:
     - .kitchen_scenario_windows_a6

.gitlab/package_build/deb.yml

@@ -207,7 +207,6 @@ dogstatsd_deb-x64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["go_mod_tidy_check", "build_dogstatsd-binary_x64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]
@@ -265,7 +264,6 @@ agentless_scanner_deb-x64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["go_mod_tidy_check", "build_agentless_scanner-binary_x64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]

.gitlab/package_build/rpm.yml

@@ -232,7 +232,6 @@ agentless_scanner_rpm-x64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["go_mod_tidy_check", "build_agentless_scanner-binary_x64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]
@@ -264,7 +263,6 @@ agentless_scanner_rpm-arm64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
   needs: ["go_mod_tidy_check", "build_agentless_scanner-binary_arm64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]

.gitlab/package_build/suse_rpm.yml

@@ -152,7 +152,6 @@ dogstatsd_suse-x64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/suse_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["go_mod_tidy_check", "build_dogstatsd-binary_x64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]
@@ -185,7 +184,6 @@ agentless_scanner_suse-x64:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/suse_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["go_mod_tidy_check", "build_agentless_scanner-binary_x64", "go_deps"]
-  variables:
   before_script:
     - source /root/.bashrc
     - !reference [.retrieve_linux_go_deps]

.gitlab/source_test/linux.yml

@@ -16,7 +16,6 @@
   stage: source_test
   needs: ["go_deps", "go_tools_deps"]
   rules:
-    - !reference [.except_mergequeue]
     - !reference [.except_disable_unit_tests]
     - !reference [.fast_on_dev_branch_only]
   variables:

.gitlab/source_test/macos.yml

@@ -23,7 +23,7 @@ tests_macos:
     - source /root/.bashrc
     # Upload generated junit files
     - export DATADOG_API_KEY=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.datadog_api_key_org2)
-    - for f in junit-*.tgz; do inv -e junit-upload --tgz-path $f; done
+    - for f in junit-*-repacked.tgz; do inv -e junit-upload --tgz-path $f; done
   artifacts:
     expire_in: 2 weeks
     when: always

.pre-commit-config.yaml

@@ -104,8 +104,17 @@ repos:
     - id: shell-check-no-set-x
       name: shell-check-no-set-x
       description: check that no `set -x` is set within github / gitlab workflows
-      entry: bash ./tools/pre-commit/shell_check_no_set_x.sh
+      entry: inv pre-commit.shell-check-no-set-x
       language: system
       require_serial: true
       files: (\.yaml|\.yml|\.sh|Dockerfile)$
       pass_filenames: false
+    - id: gitlab-configuration
+      name: gitlab-configuration
+      description: test the gitlab configuration on main
+      entry: 'inv linter.gitlab-ci -t main'
+      language: system
+      require_serial: true
+      files: .*gitlab.*\.yml$
+      pass_filenames: false
+      stages: [pre-push]