Skip to content

SONARSCALA-63 Use lightweight Enterprise SQ edition in integration tests #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erwan-serandour merged 1 commit into from
Jun 10, 2025
Merged

SONARSCALA-63 Use lightweight Enterprise SQ edition in integration tests #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,14 @@
ws_artifacts:
path: "whitesource/**/*"

qa_plugin_task:

Check warning on line 92 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L92 

task "qa_plugin" depends on task "build", but their only_if conditions are different

Check warning on line 92 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L92 

task "qa_plugin" depends on task "build", but their only_if conditions are different

Check warning on line 92 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L92 

task "qa_plugin" depends on task "build", but their only_if conditions are different

Check warning on line 92 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L92 

task "qa_plugin" depends on task "build", but their only_if conditions are different
<<: *QA_TASK_FILTER
eks_container:
<<: *CONTAINER_DEFINITION
cpu: 8
memory: 8G
env:
GITHUB_TOKEN: VAULT[development/github/token/licenses-ro token]
matrix:
- SQ_VERSION: "LATEST_RELEASE"
- SQ_VERSION: "DEV"
Expand All @@ -110,12 +111,14 @@
-I "${GRADLE_HOME}/init.d/repoxAuth.init.gradle.kts"
--info --stacktrace --console plain --no-daemon --build-cache

qa_ruling_task:

Check warning on line 114 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L114 

task "qa_ruling" depends on task "build", but their only_if conditions are different

Check warning on line 114 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L114 

task "qa_ruling" depends on task "build", but their only_if conditions are different
<<: *QA_TASK_FILTER
eks_container:
<<: *CONTAINER_DEFINITION
cpu: 8
memory: 8G
env:
GITHUB_TOKEN: VAULT[development/github/token/licenses-ro token]
<<: *SETUP_GRADLE_CACHE
ruling_script:
- *log_develocity_url_script
Expand All @@ -128,7 +131,7 @@
-I "${GRADLE_HOME}/init.d/repoxAuth.init.gradle.kts"
--info --stacktrace --console plain --no-daemon --build-cache

promote_task:

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_plugin", but their only_if conditions are different

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_plugin", but their only_if conditions are different

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_ruling", but their only_if conditions are different

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_plugin", but their only_if conditions are different

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_plugin", but their only_if conditions are different

Check warning on line 134 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L134 

task "promote" depends on task "qa_ruling", but their only_if conditions are different
depends_on:
- build
- qa_plugin
Expand Down
3 changes: 3 additions & 0 deletions its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.sonarsource.slang;

import com.sonar.orchestrator.container.Edition;
import com.sonar.orchestrator.junit4.OrchestratorRule;
import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
import com.sonar.orchestrator.locator.Locators;
Expand Down Expand Up @@ -67,6 +68,8 @@ public static void prepare() throws Exception {
Tests.addLanguagePlugins(orchestratorBuilder);
OrchestratorRule orchestrator = orchestratorBuilder
.useDefaultAdminCredentialsForBuilds(true)
.setEdition(Edition.ENTERPRISE_LW)
.activateLicense()
.setSonarVersion(System.getProperty(Tests.SQ_VERSION_PROPERTY, Tests.DEFAULT_SQ_VERSION))
.build();

Expand Down
3 changes: 3 additions & 0 deletions its/plugin/src/test/java/org/sonarsource/slang/Tests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.sonarsource.slang;

import com.sonar.orchestrator.container.Edition;
import com.sonar.orchestrator.junit4.OrchestratorRule;
import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
import com.sonar.orchestrator.locator.FileLocation;
Expand Down Expand Up @@ -53,6 +54,8 @@ public class Tests {
addLanguagePlugins(orchestratorBuilder);
ORCHESTRATOR = orchestratorBuilder
.useDefaultAdminCredentialsForBuilds(true)
.setEdition(Edition.ENTERPRISE_LW)
.activateLicense()
.setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
.restoreProfileAtStartup(FileLocation.of("src/test/resources/nosonar-scala.xml"))
.restoreProfileAtStartup(FileLocation.of("src/test/resources/norule.xml"))
Expand Down
3 changes: 3 additions & 0 deletions its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.sonarsource.slang;

import com.sonar.orchestrator.build.SonarScanner;
import com.sonar.orchestrator.container.Edition;
import com.sonar.orchestrator.junit4.OrchestratorRule;
import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
import com.sonar.orchestrator.locator.FileLocation;
Expand Down Expand Up @@ -49,6 +50,8 @@ public class SlangRulingTest {
public static void setUp() {
OrchestratorRuleBuilder builder = OrchestratorRule.builderEnv()
.useDefaultAdminCredentialsForBuilds(true)
.setEdition(Edition.ENTERPRISE_LW)
.activateLicense()
.setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
.addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.10.0.2181"));

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencyResolutionManagement {
def analyzerCommonsVersion = '2.16.0.3141'
def pluginApiVersion = '10.10.0.2391'
def sonarqubeVersion = '10.0.0.68432'
def orchestratorVersion = '5.5.0.2535'
def orchestratorVersion = '5.6.2.2625'
def sonarlintVersion = '9.0.0.74282'
// slf4j is provided by SQ, SC or SL, should be aligned with sonar-plugin-api
def slf4jApiVersion = '1.7.30'
Expand Down