Reverted test code.

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -31,7 +31,7 @@ variables:
   GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   BUILDER_IMAGE_VERSION_PREFIX: "v26.02-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
-  DEFAULT_TEST_JVMS: /^(8|21|ibm8)$/ # the latest "stable" version is 26
+  DEFAULT_TEST_JVMS: /^(8|11|17|21|25|stable)$/ # the latest "stable" version is 26
   PROFILE_TESTS:
     description: "Enable profiling of tests"
     value: "false"
@@ -468,17 +468,17 @@ check_build_src:
   variables:
     GRADLE_TARGET: ":buildSrc:build"
 
-# check_base:
-#   extends: .check_job
-#   variables:
-#     GRADLE_TARGET: ":baseCheck"
-#
-# check_inst:
-#   extends: .check_job
-#   parallel: 4
-#   variables:
-#     GRADLE_TARGET: ":instrumentationCheck"
-#     CACHE_TYPE: "inst"
+check_base:
+  extends: .check_job
+  variables:
+    GRADLE_TARGET: ":baseCheck"
+
+check_inst:
+  extends: .check_job
+  parallel: 4
+  variables:
+    GRADLE_TARGET: ":instrumentationCheck"
+    CACHE_TYPE: "inst"
 
 check_smoke:
   extends: .check_job
@@ -670,36 +670,36 @@ agent_integration_tests:
         DD_HOSTNAME: "local-agent"
         DD_API_KEY: "invalid_key_but_this_is_fine"
 
-# test_base:
-#   extends: .test_job
-#   variables:
-#     GRADLE_TARGET: ":baseTest"
-#     CACHE_TYPE: "base"
-#   parallel:
-#     matrix: *test_matrix_4
-#   script:
-#     - if [ "$testJvm" == "8" ]; then export GRADLE_PARAMS="-PskipFlakyTests -PcheckCoverage"; fi
-#     - !reference [.test_job, script]
-
-# test_inst:
-#   extends: .test_job_with_test_agent
-#   variables:
-#     GRADLE_TARGET: ":instrumentationTest"
-#     CACHE_TYPE: "inst"
-#   parallel:
-#     matrix: *test_matrix_8
-#
-# test_inst_latest:
-#   extends: .test_job_with_test_agent
-#   variables:
-#     GRADLE_TARGET: ":instrumentationLatestDepTest"
-#     CACHE_TYPE: "latestdep"
-#   parallel:
-#     matrix:
-#       - testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25
-#         # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
-#         # This emulates "parallel" by including it in the matrix
-#         CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
+test_base:
+  extends: .test_job
+  variables:
+    GRADLE_TARGET: ":baseTest"
+    CACHE_TYPE: "base"
+  parallel:
+    matrix: *test_matrix_4
+  script:
+    - if [ "$testJvm" == "8" ]; then export GRADLE_PARAMS="-PskipFlakyTests -PcheckCoverage"; fi
+    - !reference [.test_job, script]
+
+test_inst:
+  extends: .test_job_with_test_agent
+  variables:
+    GRADLE_TARGET: ":instrumentationTest"
+    CACHE_TYPE: "inst"
+  parallel:
+    matrix: *test_matrix_8
+
+test_inst_latest:
+  extends: .test_job_with_test_agent
+  variables:
+    GRADLE_TARGET: ":instrumentationLatestDepTest"
+    CACHE_TYPE: "latestdep"
+  parallel:
+    matrix:
+      - testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25
+        # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
+        # This emulates "parallel" by including it in the matrix
+        CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
 
 test_flaky:
   extends: .test_job_with_test_agent

dd-smoke-tests/concurrent/java-21/src/test/groovy/datadog/smoketest/concurrent/AbstractConcurrentTest.groovy

@@ -65,7 +65,7 @@ abstract class AbstractConcurrentTest extends AbstractSmokeTest {
   }
 
   protected void receivedCorrectTrace() {
-    waitForTrace(freezePoll, checkTrace())
+    waitForTrace(defaultPoll, checkTrace())
     assert traceCount.get() == 1
     assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
     assert testedProcess.exitValue() == 0

dd-smoke-tests/concurrent/java-21/src/test/groovy/datadog/smoketest/concurrent/VirtualThreadTest.groovy

@@ -1,11 +1,14 @@
 package datadog.smoketest.concurrent
 
+import datadog.trace.test.util.Flaky
+
 class VirtualThreadStartTest extends AbstractConcurrentTest {
   @Override
   protected List<String> getTestArguments() {
     return ['virtualThreadStart']
   }
 
+  @Flaky("Sometimes fails on CI with: Condition not satisfied after 30.00 seconds and 31 attempts")
   def 'test Thread.startVirtualThread() runnable'() {
     expect:
     receivedCorrectTrace()
@@ -54,6 +57,7 @@ class VirtualThreadSubmitRunnableTest extends AbstractConcurrentTest {
     return ['virtualThreadSubmitRunnable']
   }
 
+  @Flaky("Sometimes fails on CI with: Condition not satisfied after 30.00 seconds and 31 attempts")
   def 'test VirtualThread submit runnable'() {
     expect:
     receivedCorrectTrace()

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

@@ -68,9 +68,6 @@ abstract class AbstractSmokeTest extends ProcessManager {
   @Shared
   protected final PollingConditions defaultPoll = new PollingConditions(timeout: 30, initialDelay: 0, delay: 1, factor: 1)
 
-  @Shared
-  protected final PollingConditions freezePoll = new PollingConditions(timeout: 1260, initialDelay: 0, delay: 5, factor: 2)
-
   @Shared
   @AutoCleanup
   protected TestHttpServer server = httpServer {