Skip to content

Commit 6f55eed

Browse files
Merge branch 'master' into alexeyk/debug-ci-timeout
2 parents 119f529 + 032aad2 commit 6f55eed

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package datadog.smoketest
33

44
import datadog.trace.agent.test.utils.OkHttpUtils
55
import datadog.trace.agent.test.utils.PortUtils
6+
import datadog.trace.test.util.Flaky
67
import okhttp3.OkHttpClient
78
import spock.lang.Shared
89
import static org.junit.Assume.assumeTrue
@@ -155,6 +156,7 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest {
155156
[]
156157
}
157158

159+
@Flaky("Possible reasons: tests are too fast, the waiting mechanism is not robust enough; somehow too much telemetry is produced.")
158160
@RunLast
159161
@SuppressWarnings('UnnecessaryBooleanExpression')
160162
void 'receive telemetry app-dependencies-loaded'() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)