SCANJLIB-260 Run QA on LTA 2025.1

Author: henryju

.cirrus.yml

@@ -91,6 +91,7 @@ qa_task:
   env:
     matrix:
       - SQ_VERSION: LATEST_RELEASE
+      - SQ_VERSION: LATEST_RELEASE[2025.1]
       - SQ_VERSION: LATEST_RELEASE[9.9]
     JAVA_VERSION:
       - LATEST_RELEASE

its/it-tests/src/test/java/com/sonar/scanner/lib/it/PropertiesTest.java

@@ -69,7 +69,7 @@ public void cacheIsInUserHomeByDefault() throws IOException {
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(), Map.of());
     assertThat(buildResult.getLastStatus()).isZero();
 
-    assertThat(Paths.get(System.getProperty("user.home")).resolve(".sonar/cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-engine*.jar"));
+    assertThat(Paths.get(System.getProperty("user.home")).resolve(".sonar/cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-*.jar"));
   }
 
   @Test
@@ -80,7 +80,7 @@ public void overrideHomeDirectoryWithEnv() throws IOException {
       Map.of("SONAR_USER_HOME", userHome.getAbsolutePath()));
     assertThat(buildResult.getLastStatus()).isZero();
 
-    assertThat(userHome.toPath().resolve("cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-engine*.jar"));
+    assertThat(userHome.toPath().resolve("cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-*.jar"));
   }
 
   @Test
@@ -90,7 +90,7 @@ public void overrideHomeDirectoryWithProps() throws IOException {
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of("sonar.userHome", userHome.getAbsolutePath()), Map.of());
     assertThat(buildResult.getLastStatus()).isZero();
 
-    assertThat(userHome.toPath().resolve("cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-engine*.jar"));
+    assertThat(userHome.toPath().resolve("cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-*.jar"));
   }
 
   private static Path project(String projectName) {

its/it-tests/src/test/java/com/sonar/scanner/lib/it/ScannerJavaLibraryTestSuite.java

@@ -19,9 +19,9 @@
  */
 package com.sonar.scanner.lib.it;
 
+import com.sonar.orchestrator.container.Edition;
 import com.sonar.orchestrator.http.HttpMethod;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
-import com.sonar.orchestrator.locator.MavenLocation;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -35,13 +35,19 @@
 public class ScannerJavaLibraryTestSuite {
   private static final String SONAR_RUNTIME_VERSION = "sonar.runtimeVersion";
 
+  public static final String LATEST_RELEASE = "LATEST_RELEASE";
   @ClassRule
   public static final OrchestratorRule ORCHESTRATOR = OrchestratorRule.builderEnv()
-    .setSonarVersion(System.getProperty(SONAR_RUNTIME_VERSION, "DEV"))
+    .setSonarVersion(getServerVersion())
+    .setEdition(getServerVersion().equals(LATEST_RELEASE) ? Edition.COMMUNITY : Edition.DEVELOPER)
     .useDefaultAdminCredentialsForBuilds(true)
     .addBundledPluginToKeep("sonar-javascript")
     .build();
 
+  private static String getServerVersion() {
+    return System.getProperty(SONAR_RUNTIME_VERSION, LATEST_RELEASE);
+  }
+
   public static void resetData(OrchestratorRule orchestrator) {
     Instant instant = Instant.now();