[NO JIRA] Remove the Ktor project IT from ruling tests

Author: leveretka

.cirrus.yml

@@ -95,23 +95,6 @@ gradle_its_template: &GRADLE_ITS_TEMPLATE
       -Pqa --info --console plain --no-daemon --build-cache
   <<: *CLEANUP_GRADLE_CACHE_SCRIPT
 
-kotlin_its_template: &KOTLIN_ITS_TEMPLATE
-  <<: *SETUP_GRADLE_CACHE
-  run_its_script:
-    - |
-      if [ -n "${GIT_SUB_MODULE}" ]; then
-        git submodule update --init --depth 1 "${GIT_SUB_MODULE}"
-      fi
-    - source cirrus-env QA
-    - bash ./build-ktor.sh
-    - ./gradlew "${GRADLE_TASK}" "-P${ITS_PROJECT}"
-      "-Dsonar.runtimeVersion=${SQ_VERSION}"
-      "-Dorchestrator.configUrl=https://repox.jfrog.io/repox/orchestrator.properties/orch-h2.properties"
-      "-Dorchestrator.artifactory.accessToken=${ARTIFACTORY_ACCESS_TOKEN}"
-      "-DbuildNumber=$BUILD_NUMBER"
-      -Pqa --info --console plain --no-daemon --build-cache
-  <<: *CLEANUP_GRADLE_CACHE_SCRIPT
-
 only_if_sonarsource_qa_template: &ONLY_IF_SONARSOURCE_QA
   only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")
 
@@ -213,7 +196,7 @@ qa_ruling_kotlin_task:
     ITS_PROJECT: "ruling"
     GIT_SUB_MODULE: "its/sources"
   <<: *LINUX_6_CPU_12G_JAVA_17
-  <<: *KOTLIN_ITS_TEMPLATE
+  <<: *GRADLE_ITS_TEMPLATE
 
 build_win_task:
   <<: *QA_TASK_FILTER
@@ -231,6 +214,7 @@ build_win_task:
 promote_task:
   depends_on:
     - build
+    - build_test_analyze
     - qa_plug_pub_lin
     - qa_plug_pub_win
     - qa_ruling_kotlin

build-ktor.sh

@@ -33,20 +33,16 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonarsource.analyzer.commons.ProfileGenerator;
@@ -106,62 +102,7 @@ private static void addLanguagePlugins(OrchestratorBuilder builder) {
   }
 
   @Test
-  public void test_kotlin_ktor() throws IOException {
-    List<String> ktorDirs = Arrays.asList(
-            "",
-            "ktor-client/ktor-client-winhttp/",
-            "ktor-client/ktor-client-tests/",
-            "ktor-client/ktor-client-plugins/ktor-client-websockets/",
-            "ktor-client/ktor-client-plugins/ktor-client-tracing/",
-            "ktor-client/ktor-client-plugins/ktor-client-resources/",
-            "ktor-client/ktor-client-plugins/ktor-client-logging/",
-            "ktor-client/ktor-client-plugins/ktor-client-json/",
-            "ktor-client/ktor-client-plugins/ktor-client-encoding/",
-            "ktor-client/ktor-client-plugins/ktor-client-content-negotiation/",
-            "ktor-client/ktor-client-plugins/ktor-client-auth/",
-            "ktor-client/ktor-client-plugins/",
-            "ktor-client/ktor-client-okhttp/",
-            "ktor-client/ktor-client-mock/",
-            "ktor-client/ktor-client-js/",
-            "ktor-client/ktor-client-jetty-jakarta/",
-            "ktor-client/ktor-client-jetty/",
-            "ktor-client/ktor-client-java/",
-            "ktor-client/ktor-client-ios/",
-            "ktor-client/ktor-client-darwin-legacy/",
-            "ktor-client/ktor-client-darwin/",
-            "ktor-client/ktor-client-curl/",
-            "ktor-client/ktor-client-core/",
-            "ktor-client/ktor-client-cio/",
-            "ktor-client/ktor-client-apache5/",
-            "ktor-client/ktor-client-apache/",
-            "ktor-client/ktor-client-android/",
-            "ktor-client/",
-            "ktor-http/",
-            "ktor-io/",
-            "ktor-java-modules-test/",
-            "ktor-network/",
-            "ktor-server/",
-            "ktor-shared/",
-            "ktor-test-dispatcher/",
-            "ktor-utils/");
-
-    String binaries = ktorDirs.stream().map(dir -> FileLocation.of("../sources/kotlin/ktor/" + dir + "build/classes"))
-      .map(SlangRulingTest::getFileLocationAbsolutePath)
-      .collect(Collectors.joining(","));
-
-    String libraries = ktorDirs.stream().map(dir -> FileLocation.of("../sources/kotlin/ktor/" + dir + "build/libs"))
-      .map(SlangRulingTest::getFileLocationAbsolutePath)
-      .collect(Collectors.joining(","));
-
-    executeSonarScannerAndAssertDifferences("kotlin/ktor", Map.of(
-      "sonar.inclusions", "sources/kotlin/ktor/**/*.kt",
-      "sonar.exclusions", "**/testData/**/*,**/Win*.kt,**/PrimitiveArraysTest.kt,**/ContentTestSuite.kt",
-      "sonar.java.binaries", binaries,
-      "sonar.java.libraries", libraries));
-  }
-
-  @Test
-  public void test_kotlin_compiler() throws IOException {
+  void test_kotlin_compiler() throws IOException {
     List<String> exclusions = List.of(
       "**/testData/**/*",
       "sources/kotlin/kotlin/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt",
@@ -174,46 +115,46 @@ public void test_kotlin_compiler() throws IOException {
   }
 
   @Test
-  public void test_resources_sources() throws IOException {
+  void test_resources_sources() throws IOException {
     executeSonarScannerAndAssertDifferences("kotlin/test-resources-sources", Map.of(
       "sonar.inclusions", "ruling/src/test/resources/sources/kotlin/**/*.kt",
       "sonar.java.libraries", System.getProperty("gradle.main.compile.classpath").replace(File.pathSeparatorChar, ',')
     ));
   }
 
   @Test
-  public void test_kotlin_android() throws IOException {
+  void test_kotlin_android() throws IOException {
     executeSonarScannerAndAssertDifferences("kotlin/android-architecture-components", Map.of(
       "sonar.inclusions", "sources/kotlin/android-architecture-components/**/*.kt",
       "sonar.exclusions", "**/testData/**/*"
     ));
   }
 
   @Test
-  public void test_kotlin_corda() throws IOException {
+  void test_kotlin_corda() throws IOException {
     executeSonarScannerAndAssertDifferences("kotlin/corda", Map.of(
       "sonar.inclusions", "sources/kotlin/corda/**/*.kt",
       "sonar.exclusions", "**/testData/**/*"
     ));
   }
 
   @Test
-  public void test_kotlin_intellij_rust() throws IOException {
+  void test_kotlin_intellij_rust() throws IOException {
     executeSonarScannerAndAssertDifferences("kotlin/intellij-rust", Map.of(
       "sonar.inclusions", "sources/kotlin/intellij-rust/**/*.kt",
       "sonar.exclusions", "**/testData/**/*"
     ));
   }
 
   @Test
-  public void test_kotlin_okio() throws IOException {
+  void test_kotlin_okio() throws IOException {
     executeSonarScannerAndAssertDifferences("kotlin/okio", Map.of(
       "sonar.inclusions", "sources/kotlin/okio/**/*.kt",
       "sonar.exclusions", "**/testData/**/*"));
   }
 
   @Test
-  public void test_kotlin_language_server() throws IOException {
+  void test_kotlin_language_server() throws IOException {
     executeGradleBuildAndAssertDifferences("kotlin/kotlin-language-server", Map.of());
   }