SSI GitLab Test Optimization (#6966)

Author: robertomonteromiguel

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/single-step-instrumentation-tests.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/0b4d88122bb64a87131eeb9446a3671598790917ec30fc31851ccb6ee8375b8a/single-step-instrumentation-tests.yml
 stages:
   - configure
   - nodejs

.gitlab/ssi_gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/single-step-instrumentation-tests.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/0b4d88122bb64a87131eeb9446a3671598790917ec30fc31851ccb6ee8375b8a/single-step-instrumentation-tests.yml
 
 stages:
   - SSI_TESTS
@@ -47,6 +47,21 @@ ssi_tests:
             done
           done
         fi
+
+        # Push JUnit results to Datadog Test Optimization
+        export DATADOG_SITE="${DATADOG_SITE:-datadoghq.com}"
+        export DATADOG_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.${CI_PROJECT_NAME}.test_optimization.dd_api_key --with-decryption --query "Parameter.Value" --out text)
+        export DD_TAGS="test.configuration.ci_environment:${CI_ENVIRONMENT:-prod}"
+        if compgen -G "reports/logs*/reportJunit.xml" > /dev/null; then
+            datadog-ci junit upload \
+                reports/logs*/reportJunit.xml \
+                --service system-tests \
+                --env ci \
+                --verbose \
+                --xpath-tag "test.codeowners=/testcase/properties/property[@name='test.codeowners']"
+        else
+            echo "No reports/logs*/reportJunit.xml found; skipping Test Optimization upload"
+        fi
     retry:
       max: 2
       when:

utils/_context/_scenarios/docker_ssi.py

@@ -290,6 +290,21 @@ def dd_apm_inject_version(self):
     def configuration(self):
         return self._configuration
 
+    def get_junit_properties(self) -> dict[str, str]:
+        result = super().get_junit_properties()
+
+        result["dd_tags[systest.suite.context.library.name]"] = self.library.name
+        result["dd_tags[systest.suite.context.library.version]"] = self.library.version
+        result["dd_tags[systest.suite.context.weblog_variant]"] = self.weblog_variant
+        result["dd_tags[systest.suite.context.agent]"] = self.components["agent"]
+        result["dd_tags[systest.suite.context.datadog-apm-inject.version]"] = self.dd_apm_inject_version
+        result["dd_tags[systest.suite.context.datadog-installer.version]"] = self.components["datadog-installer"]
+        result["dd_tags[systest.suite.context.installed_language_runtime]"] = self.installed_language_runtime or ""
+        result["dd_tags[systest.suite.context.os]"] = self.configuration["os"]
+        result["dd_tags[systest.suite.context.arch]"] = self.configuration["arch"]
+
+        return result
+
 
 class DockerSSIImageBuilder:
     """Manages the docker image building for the SSI scenario"""