From 6c03e29f9c0f007be5689dba9caa6ba2cd3979f7 Mon Sep 17 00:00:00 2001
From: Paul Cacheux <paul.cacheux@datadoghq.com>
Date: Wed, 16 Oct 2024 18:49:04 +0200
Subject: [PATCH] move junit upload from `unit_tests_arm64_junit_upload` to
 direct jobs

---
 .gitlab-ci.yml                        |  3 +--
 .gitlab/.ci-linters.yml               |  1 -
 .gitlab/junit_upload/junit_upload.yml | 14 --------------
 .gitlab/source_test/linux.yml         |  2 ++
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 .gitlab/junit_upload/junit_upload.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14c629d013c2..21325e77f8004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,6 @@ include:
   - .gitlab/integration_test/include.yml
   - .gitlab/internal_image_deploy/internal_image_deploy.yml
   - .gitlab/internal_kubernetes_deploy/include.yml
-  - .gitlab/junit_upload/junit_upload.yml
   - .gitlab/kitchen_cleanup/include.yml
   - .gitlab/kitchen_deploy/kitchen_deploy.yml
   - .gitlab/kitchen_testing/include.yml
@@ -257,7 +256,7 @@ variables:
   VCPKG_BLOB_SAS_URL: ci.datadog-agent-buildimages.vcpkg_blob_sas_url  # windows-agent
   WINGET_PAT: ci.datadog-agent.winget_pat  # windows-agent
   # End aws ssm variables
- 
+
   # Start vault variables
   AGENT_API_KEY_ORG2: agent-api-key-org-2  # agent-devx-infra
   AGENT_APP_KEY_ORG2: agent-ci-app-key-org-2  # agent-devx-infra
diff --git a/.gitlab/.ci-linters.yml b/.gitlab/.ci-linters.yml
index db38acacdd029..b888dff051b73 100644
--- a/.gitlab/.ci-linters.yml
+++ b/.gitlab/.ci-linters.yml
@@ -109,7 +109,6 @@ job-owners:
     - trace-agent-v05-2cpus-normal_load-fixed_sps
     - trace-agent-v05-2cpus-stress_load-fixed_sps
     - trigger-flakes-finder
-    - unit_tests_arm64_junit_upload
     - unit_tests_notify
     - update_rc_build_links
     - validate_modules
diff --git a/.gitlab/junit_upload/junit_upload.yml b/.gitlab/junit_upload/junit_upload.yml
deleted file mode 100644
index 85cedd519efc8..0000000000000
--- a/.gitlab/junit_upload/junit_upload.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-unit_tests_arm64_junit_upload:
-  stage: junit_upload
-  rules:
-    - !reference [.except_mergequeue]
-    - when: always
-  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"]
-  allow_failure: true
-  needs:
-    - tests_deb-arm64-py3
-    - tests_rpm-arm64-py3
-  script:
-    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
diff --git a/.gitlab/source_test/linux.yml b/.gitlab/source_test/linux.yml
index 31bcf7767b5b1..4eca8e57759c2 100644
--- a/.gitlab/source_test/linux.yml
+++ b/.gitlab/source_test/linux.yml
@@ -124,6 +124,7 @@ tests_deb-arm64-py3:
     - .rtloader_tests
     - .linux_tests
   after_script:
+    - !reference [.upload_junit_source]
     - !reference [.upload_coverage]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
@@ -136,6 +137,7 @@ tests_rpm-arm64-py3:
     - .rtloader_tests
     - .linux_tests
   after_script:
+    - !reference [.upload_junit_source]
     - !reference [.upload_coverage]
   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"]