Skip to content

Commit c0663d5

Browse files
smolasmola
authored
Merge branch 'master' into smola/enable-api-security-by-default
2 parents 54cc08e + b1b0ab3 commit c0663d5

25 files changed

Lines changed: 636 additions & 7 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ stages:
2020
- generate-signing-key
2121

2222
variables:
23+
# Gitlab runner features; see https://docs.gitlab.com/runner/configuration/feature-flags.html
24+
# Fold and time all script sections
25+
FF_SCRIPT_SECTIONS: 1
26+
2327
REGISTRY: 486234852809.dkr.ecr.us-east-1.amazonaws.com
2428
BUILD_JOB_NAME: "build"
2529
DEPENDENCY_CACHE_POLICY: pull
@@ -132,9 +136,18 @@ default:
132136
policy: $BUILD_CACHE_POLICY
133137
before_script:
134138
- source .gitlab/gitlab-utils.sh
135-
- export GRADLE_USER_HOME=`pwd`/.gradle
139+
- export GRADLE_USER_HOME=$(pwd)/.gradle
140+
- |
141+
# Don't put jvm args here as it will be picked up by child gradle processes used in tests
142+
cat << EOF > $GRADLE_USER_HOME/gradle.properties
143+
mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
144+
gradlePluginProxy=$GRADLE_PLUGIN_PROXY
145+
EOF
146+
- |
147+
# replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
148+
sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
136149
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx$GRADLE_MEM -Xms$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
137-
- export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY -PgradlePluginProxy=$GRADLE_PLUGIN_PROXY"
150+
- export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
138151
- *normalize_node_index
139152
# for weird reasons, gradle will always "chmod 700" the .gradle folder
140153
# with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails
@@ -361,7 +374,7 @@ muzzle:
361374
- ./gradlew writeMuzzleTasksToFile $GRADLE_ARGS
362375
- sort workspace/build/muzzleTasks > sortedMuzzleTasks
363376
- split --number=l/$NORMALIZED_NODE_TOTAL --suffix-length=1 --numeric-suffixes sortedMuzzleTasks muzzleSplit
364-
- ./gradlew `cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs` $GRADLE_ARGS
377+
- ./gradlew $(cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs) $GRADLE_ARGS
365378
after_script:
366379
- *cgroup_info
367380
- source .gitlab/gitlab-utils.sh

‎.gitlab/one-pipeline.locked.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/05e116339b9780a138a474d0348e97debfca97f27bbc4ca489cf4e4c90d9cc94/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f2050f53c1f5aed62a24e6b406c746e7d593230ce02b5d56d2a2296db763ebf4/one-pipeline.yml

‎dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
9898

9999
where:
100100
gradleVersion | projectName | flakyTests | expectedOrder | eventsNumber
101-
"5.1" | "test-succeed-junit-4-class-ordering" | [
101+
"7.6.4" | "test-succeed-junit-4-class-ordering" | [
102102
test("datadog.smoke.TestSucceedB", "test_succeed"),
103103
test("datadog.smoke.TestSucceedB", "test_succeed_another"),
104104
test("datadog.smoke.TestSucceedA", "test_succeed")

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ repositories {
88
println "Using proxy repository: $proxyUrl"
99
maven {
1010
url = proxyUrl
11+
allowInsecureProtocol = true
1112
}
1213
}
1314

‎dd-smoke-tests/maven/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,9 @@ jar {
2020
tasks.withType(Test).configureEach {
2121
dependsOn "shadowJar"
2222
jvmArgs "-Ddatadog.smoketest.maven.jar.path=${tasks.shadowJar.archiveFile.get()}"
23+
24+
if (project.hasProperty("mavenRepositoryProxy")) {
25+
// propagate proxy URL to tests, to then propagate it to nested Gradle builds
26+
environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
27+
}
2328
}

‎dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
348348
command.addAll(jvmArguments(runWithAgent, setServiceName, additionalAgentArgs))
349349
command.addAll((String[]) ["-jar", mavenRunnerShadowJar])
350350
command.addAll(programArguments())
351+
command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.xml".toString()])
351352
command.addAll(mvnCommand)
352353

353354
ProcessBuilder processBuilder = new ProcessBuilder(command)
@@ -358,6 +359,11 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
358359
processBuilder.environment().put(envVar.key, envVar.value)
359360
}
360361

362+
def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY")
363+
if (mavenRepositoryProxy != null) {
364+
processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy)
365+
}
366+
361367
return processBuilder
362368
}
363369

@@ -370,6 +376,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
370376
def arguments = [
371377
"-D${MavenWrapperMain.MVNW_VERBOSE}=true".toString(),
372378
"-Duser.dir=${projectHome.toAbsolutePath()}".toString(),
379+
"-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(),
373380
"-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(),
374381
]
375382
if (runWithAgent) {

‎dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

0 commit comments

Comments
 (0)