diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 8a65e0b1949..1ec42fbf2cc 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -18,6 +18,11 @@ test { events "passed", "skipped", "failed", "standardOut", "standardError" } + if (project.hasProperty("mavenRepositoryProxy")) { + // propagate proxy URL to tests, to then propagate it to nested Gradle builds + environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy") + } + // overriding the default timeout of 9 minutes set in configure_tests.gradle, // as Gradle smoke tests might run for a longer duration timeout = Duration.of(15, ChronoUnit.MINUTES) diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy index 8944159d45e..e4a6db7a9c4 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy @@ -239,12 +239,19 @@ class GradleDaemonSmokeTest extends AbstractGradleTest { } private runGradle(String gradleVersion, List arguments, boolean successExpected) { + def buildEnv = ["GRADLE_VERSION": gradleVersion] + + def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY") + if (mavenRepositoryProxy != null) { + buildEnv += ["MAVEN_REPOSITORY_PROXY": System.getenv("MAVEN_REPOSITORY_PROXY")] + } + GradleRunner gradleRunner = GradleRunner.create() .withTestKitDir(testKitFolder.toFile()) .withProjectDir(projectFolder.toFile()) .withGradleVersion(gradleVersion) .withArguments(arguments) - .withEnvironment(["GRADLE_VERSION": gradleVersion]) + .withEnvironment(buildEnv) .forwardOutput() println "${new Date()}: $specificationContext.currentIteration.displayName - Starting Gradle run" diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest index 8f4344573a7..9a1f5e552b1 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest index 8f4344573a7..9a1f5e552b1 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest index f8a38f33853..4e71ba3bc73 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest @@ -14,6 +14,16 @@ gradlePlugin { repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest index 27685459d0e..ed7646e3a4e 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest @@ -2,6 +2,15 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest index 0688933f199..b1c3cff6d5c 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest @@ -3,6 +3,16 @@ apply plugin: 'jvm-test-suite' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest index ad869174f34..df8b0d91899 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest index ad869174f34..df8b0d91899 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest index 14bbd056756..e6246089031 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest @@ -3,6 +3,16 @@ subprojects { repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest index 14bbd056756..e6246089031 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest @@ -3,6 +3,16 @@ subprojects { repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest index 5aa8ddbc416..924451fb8e0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest @@ -2,6 +2,16 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + allowInsecureProtocol = true + } + } + mavenCentral() } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest index d8c4648b67b..d537a62a23a 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest @@ -2,6 +2,15 @@ apply plugin: 'java' repositories { mavenLocal() + + def proxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + if (proxyUrl) { + println "Using proxy repository: $proxyUrl" + maven { + url = proxyUrl + } + } + mavenCentral() }