From 1f3ee626c1faa8f32aa15ce8dcc0ed333e6e57aa Mon Sep 17 00:00:00 2001 From: Sébastien Lesaint Date: Mon, 20 May 2019 16:39:42 +0200 Subject: SONAR-11264 enforce ES boostrap checks on all editions --- server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'server/sonar-db-core') diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java index 0106b571634..b81ea66aa01 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java @@ -26,6 +26,7 @@ import com.sonar.orchestrator.locator.Location; import org.apache.commons.lang.StringUtils; import java.io.File; +import org.sonar.api.utils.log.Loggers; import static com.sonar.orchestrator.container.Edition.COMMUNITY; @@ -42,6 +43,7 @@ public class CreateDb { builder.setSonarVersion(version); } builder.setOrchestratorProperty("orchestrator.workspaceDir", "build/it"); + builder.setServerProperty("sonar.es.bootstrap.checks.disable", areEsBootStrapChecksDisabled() ? "true" : "false"); Orchestrator orchestrator = builder.build(); try { @@ -50,4 +52,12 @@ public class CreateDb { orchestrator.stop(); } } + + private static boolean areEsBootStrapChecksDisabled() { + boolean flag = "true".equalsIgnoreCase(System.getenv("CIRRUS_CI")); + if (flag) { + Loggers.get(CreateDb.class).info("Running on Cirrus: ES Bootstrap checks are disabled"); + } + return flag; + } } -- cgit v1.2.3