Skip to content

Commit e5ac95c

Browse files
Godinerwan-serandour
authored andcommitted
Use lightweight Enterprise SQ edition in integration tests
1 parent 29bd363 commit e5ac95c

File tree

6 files changed

+10
-3
lines changed

6 files changed

+10
-3
lines changed

its/autoscan/src/test/java/org/sonar/java/it/AutoScanTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public class AutoScanTest {
6363

6464
@ClassRule
6565
public static OrchestratorRule orchestrator = OrchestratorRule.builderEnv()
66+
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
67+
.activateLicense()
6668
.useDefaultAdminCredentialsForBuilds(true)
6769
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
6870
.addPlugin(FileLocation.of(TestClasspathUtils.findModuleJarPath("../../sonar-java-plugin").toFile()))

its/plugin/tests/src/test/java/com/sonar/it/java/JspTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ private static OrchestratorRule getEnterpriseOrchestratorOrNull() {
5050
OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv()
5151
.useDefaultAdminCredentialsForBuilds(true)
5252
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
53-
.setEdition(Edition.ENTERPRISE)
53+
.setEdition(Edition.ENTERPRISE_LW)
54+
.activateLicense()
5455
.addPlugin(JavaTestSuite.JAVA_PLUGIN_LOCATION)
5556
// we need html plugin to have "jsp" language
5657
.addPlugin(MavenLocation.of("org.sonarsource.html", "sonar-html-plugin", "DEV"))

its/plugin/tests/src/test/java/com/sonar/it/java/suite/CacheEnabledTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public void test_cache_is_disabled() {
6565

6666
private static OrchestratorRule initServer() {
6767
return OrchestratorRule.builderEnv()
68+
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
69+
.activateLicense()
6870
.useDefaultAdminCredentialsForBuilds(true)
6971
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
7072
.addPlugin(JavaTestSuite.JAVA_PLUGIN_LOCATION)

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTestSuite.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ public class JavaTestSuite {
6464
OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv()
6565
.useDefaultAdminCredentialsForBuilds(true)
6666
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
67+
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
68+
.activateLicense()
6769
.addPlugin(JAVA_PLUGIN_LOCATION)
6870
// for support of custom rules
6971
.addPlugin(FileLocation.of(TestUtils.pluginJar("java-extension-plugin")))

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private static OrchestratorRule createOrchestrator() {
100100
if (isCommunityEditionTestsOnly()) {
101101
orchestratorBuilder.setEdition(Edition.COMMUNITY);
102102
} else {
103-
orchestratorBuilder.setEdition(Edition.DEVELOPER)
103+
orchestratorBuilder.setEdition(Edition.ENTERPRISE_LW)
104104
.activateLicense();
105105
}
106106
return orchestratorBuilder.build();

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<sonar.plugin.api.version>11.0.0.2664</sonar.plugin.api.version>
9595
<sonarlint.plugin.api.version>10.13.0.79996</sonarlint.plugin.api.version>
9696
<analyzer.commons.version>2.17.0.3322</analyzer.commons.version>
97-
<orchestrator.version>5.5.0.2535</orchestrator.version>
97+
<orchestrator.version>5.6.2.2625</orchestrator.version>
9898
<sslr.version>1.24.0.633</sslr.version>
9999
<argLine>-Xmx512m</argLine>
100100
<gitRepositoryName>sonar-java</gitRepositoryName>

0 commit comments

Comments
 (0)