Merge branch 'master' into alejandro.gonzalez/appsec-block-refactor

Author: jandro996

.gitlab-ci.yml

@@ -728,7 +728,7 @@ test_smoke:
     GRADLE_PARAMS: "-PskipFlakyTests"
     CACHE_TYPE: "smoke"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_ssi_smoke:
   extends: .test_job
@@ -739,7 +739,7 @@ test_ssi_smoke:
     DD_INJECT_FORCE: "true"
     DD_INJECTION_ENABLED: "tracer"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_smoke_graalvm:
   extends: .test_job