From 6bd6f3adaef939f20ec7c3e7c65ad7951935b52d Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Wed, 4 Oct 2023 15:05:41 +0200 Subject: [PATCH 1/5] Fix CI: include missing sonarlint tests in QA windows task --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7742b15152d..ebcd3ca27da 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -206,7 +206,7 @@ plugin_qa_win_task: - source /c/buildTools-docker/bin/set_maven_build_version $BUILD_NUMBER # building the custom plugin required for the further tests - mvn clean package -f its/plugin/plugins/pom.xml - - mvn -f its/plugin/tests/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" -B -e -V verify surefire-report:report + - mvn -f its/plugin/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" -B -e -V verify surefire-report:report cleanup_before_cache_script: cleanup_maven_repository ruling_task: From 69427a552c57a2c12829162a65c7bada95c814ca Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Wed, 4 Oct 2023 15:32:24 +0200 Subject: [PATCH 2/5] add projects option --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index ebcd3ca27da..abf7ccd959d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -206,7 +206,7 @@ plugin_qa_win_task: - source /c/buildTools-docker/bin/set_maven_build_version $BUILD_NUMBER # building the custom plugin required for the further tests - mvn clean package -f its/plugin/plugins/pom.xml - - mvn -f its/plugin/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" -B -e -V verify surefire-report:report + - mvn -f its/plugin/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" --projects !org.sonarsource.javascript:eslint-custom-rules-plugin -B -e -V verify surefire-report:report cleanup_before_cache_script: cleanup_maven_repository ruling_task: From acbd08e618b1db7289dca2564a7e389436e6064c Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Wed, 4 Oct 2023 16:19:42 +0200 Subject: [PATCH 3/5] move SonarLintTest to the shorter task --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index abf7ccd959d..4707395a178 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -198,8 +198,8 @@ plugin_qa_win_task: SONARSOURCE_QA: true SQ_VERSION: LATEST_RELEASE matrix: - - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!SonarLintTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest' - - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,SonarLintTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest' + - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest' + - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest' <<: *MAVEN_CACHE qa_script: - source /c/buildTools-docker/bin/cirrus-env QA From 9a67296661521972d5ce87476af7f0868d017ed5 Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Wed, 4 Oct 2023 17:27:23 +0200 Subject: [PATCH 4/5] balance tests and write up explanation --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4707395a178..f01899f84dc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -198,8 +198,10 @@ plugin_qa_win_task: SONARSOURCE_QA: true SQ_VERSION: LATEST_RELEASE matrix: - - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest' - - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest' + # tests must be balanced so that the maximum task runtime is minimized + # this fails if they don't both have tests from its/plugin/tests and its/plugin/sonarlint-tests + - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest,!SonarLintTestCodeAnalysisTest,!EslintReportTest,!TestCodeAnalysisTest,!MinifiedFilesTest,!SonarJsIntegrationTest,!EmbeddedNodeTest' + - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest,SonarLintTestCodeAnalysisTest,EslintReportTest,TestCodeAnalysisTest,MinifiedFilesTest,SonarJsIntegrationTest,EmbeddedNodeTest' <<: *MAVEN_CACHE qa_script: - source /c/buildTools-docker/bin/cirrus-env QA From 53eb5cce29b01ffa5c0c691ff4e37071714ab43a Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Wed, 4 Oct 2023 18:21:32 +0200 Subject: [PATCH 5/5] try different split --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f01899f84dc..252dd2758ad 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -200,8 +200,8 @@ plugin_qa_win_task: matrix: # tests must be balanced so that the maximum task runtime is minimized # this fails if they don't both have tests from its/plugin/tests and its/plugin/sonarlint-tests - - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest,!SonarLintTestCodeAnalysisTest,!EslintReportTest,!TestCodeAnalysisTest,!MinifiedFilesTest,!SonarJsIntegrationTest,!EmbeddedNodeTest' - - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest,SonarLintTestCodeAnalysisTest,EslintReportTest,TestCodeAnalysisTest,MinifiedFilesTest,SonarJsIntegrationTest,EmbeddedNodeTest' + - TEST: '!CoverageTest,!TypeScriptAnalysisTest,!EslintBasedRulesTest,!SonarLintTestCodeAnalysisTest,!PRAnalysisTest,!TypeCheckerConfigTest,!VueAnalysisTest' + - TEST: 'CoverageTest,TypeScriptAnalysisTest,EslintBasedRulesTest,SonarLintTestCodeAnalysisTest,PRAnalysisTest,TypeCheckerConfigTest,VueAnalysisTest' <<: *MAVEN_CACHE qa_script: - source /c/buildTools-docker/bin/cirrus-env QA