Skip to content

Commit b45086c

Browse files
authored
JS-654 Don't use maven profile for ITS (#5224)
1 parent 505fd22 commit b45086c

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

.cirrus.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ plugin_qa_body: &PLUGIN_QA_BODY
126126
qa_script:
127127
- source cirrus-env QA
128128
- source set_maven_build_version $BUILD_NUMBER
129-
- mvn -f its/plugin/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} ${MVN_TEST} -B -e -V verify surefire-report:report
129+
- mvn -f its/plugin/pom.xml -DskipTests=false -Dsonar.runtimeVersion=${SQ_VERSION} ${MVN_TEST} -B -e -V verify surefire-report:report
130130

131131
plugin_qa_body_monthly: &PLUGIN_QA_BODY_MONTHLY
132132
depends_on:
@@ -142,7 +142,7 @@ plugin_qa_body_monthly: &PLUGIN_QA_BODY_MONTHLY
142142
qa_script:
143143
- source cirrus-env QA
144144
- source set_maven_build_version $BUILD_NUMBER
145-
- mvn -f its/plugin/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} ${MVN_TEST} -B -e -V verify surefire-report:report
145+
- mvn -f its/plugin/pom.xml -DskipTests=false -Dsonar.runtimeVersion=${SQ_VERSION} ${MVN_TEST} -B -e -V verify surefire-report:report
146146

147147
build_task:
148148
eks_container:
@@ -287,7 +287,7 @@ plugin_qa_win_task:
287287
- source /c/buildTools-docker/bin/set_maven_build_version $BUILD_NUMBER
288288
# building the custom plugin required for the further tests
289289
- mvn clean package -f its/plugin/plugins/pom.xml
290-
- mvn test -f its/plugin/tests/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" -B -e -V surefire-report:report
290+
- mvn test -f its/plugin/tests/pom.xml -DskipTests=false -Dsonar.runtimeVersion=${SQ_VERSION} "-Dtest=${TEST}" -B -e -V surefire-report:report
291291

292292
# Plugin QA for Windows is split into 3 parts to make it faster
293293
plugin_qa_win_sonarlint_task:
@@ -303,7 +303,7 @@ plugin_qa_win_sonarlint_task:
303303
qa_script:
304304
- source /c/buildTools-docker/bin/cirrus-env QA
305305
- source /c/buildTools-docker/bin/set_maven_build_version $BUILD_NUMBER
306-
- mvn test -f its/plugin/sonarlint-tests/pom.xml -Dsonar.runtimeVersion=${SQ_VERSION} -B -e -V surefire-report:report
306+
- mvn test -f its/plugin/sonarlint-tests/pom.xml -DskipTests=false -Dsonar.runtimeVersion=${SQ_VERSION} -B -e -V surefire-report:report
307307

308308
js_ts_ruling_task:
309309
depends_on:
@@ -410,7 +410,7 @@ css_ruling_task:
410410
- source cirrus-env QA
411411
- source set_maven_build_version $BUILD_NUMBER
412412
- cd its/ruling
413-
- mvn test -Dtest=CssRulingTest -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -Djunit.jupiter.execution.parallel.config.dynamic.factor=1 -B -e -V
413+
- mvn test -DskipTests=false -Dtest=CssRulingTest -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -Djunit.jupiter.execution.parallel.config.dynamic.factor=1 -B -e -V
414414
on_failure:
415415
diff_artifacts:
416416
path: '**/target/actual/**/*'

its/plugin/plugins/eslint-custom-rules-plugin/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,9 @@
6363
</plugins>
6464
</build>
6565

66+
<properties>
67+
<!-- sonar scanner properties -->
68+
<sonar.sources>src/main</sonar.sources>
69+
<sonar.tests/>
70+
</properties>
6671
</project>

its/plugin/sonarlint-tests/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
<properties>
1515
<surefire.argLine>-server</surefire.argLine>
16+
<!-- sonar scanner properties -->
17+
<sonar.sources/>
18+
<sonar.tests>src/test</sonar.tests>
1619
</properties>
1720

1821
<!--

its/plugin/tests/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
<properties>
1515
<surefire.argLine>-server</surefire.argLine>
16+
<sonar.sources/>
17+
<sonar.tests>src/test</sonar.tests>
1618
</properties>
1719

1820
<dependencies>

its/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,14 @@
5656
</plugin>
5757
</plugins>
5858
</build>
59+
<properties>
60+
<maven.deploy.skip>true</maven.deploy.skip>
61+
<skipTests>true</skipTests>
62+
<!-- sonar scanner properties -->
63+
<sonar.sources>src/main</sonar.sources>
64+
<sonar.tests>src/test</sonar.tests>
65+
<sonar.javascript.lcov.reportPaths/>
66+
<sonar.typescript.tsconfigPath/>
67+
</properties>
5968

6069
</project>

its/ruling/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
<properties>
2121
<surefire.argLine>-server -Xmx512m</surefire.argLine>
22+
<sonar.sources/>
23+
<sonar.tests>src/test</sonar.tests>
2224
</properties>
2325

2426
<dependencies>

pom.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
<modules>
6060
<module>maven-plugins</module>
6161
<module>sonar-plugin</module>
62-
<!--
63-
its module is added via profile below
64-
-->
62+
<module>its</module>
6563
</modules>
6664

6765
<scm>
@@ -342,15 +340,4 @@
342340
</plugins>
343341
</pluginManagement>
344342
</build>
345-
346-
<profiles>
347-
<profile>
348-
<id>its</id>
349-
<modules>
350-
<module>its</module>
351-
</modules>
352-
</profile>
353-
</profiles>
354-
355-
356343
</project>

0 commit comments

Comments
 (0)