Merge branch 'main' into fix-129148-take2

albertzaharovits · albertzaharovits · commit 4892c16287a8 · 2025-06-25T20:16:03.000+03:00
diff --git a/modules/ingest-geoip/qa/multi-project/build.gradle b/modules/ingest-geoip/qa/multi-project/build.gradle
@@ -22,3 +22,8 @@ dependencies {
 tasks.withType(Test).configureEach {
   it.systemProperty "tests.multi_project.enabled", true
 }
+
+// Exclude multi-project tests from release build
+tasks.named { it == "javaRestTest" || it == "yamlRestTest" }.configureEach {
+  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
+}

Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,8 @@ dependencies {`
`22`	`22`	`tasks.withType(Test).configureEach {`
`23`	`23`	`it.systemProperty "tests.multi_project.enabled", true`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+// Exclude multi-project tests from release build`
	`27`	`+tasks.named { it == "javaRestTest" \|\| it == "yamlRestTest" }.configureEach {`
	`28`	`+ it.onlyIf("snapshot build") { buildParams.snapshotBuild }`
	`29`	`+}`