Skip to content

Commit adefdba

Browse files
basing integration test enforcer rules on skipITs property value (#2918)
* basing integration test enforcer rules on skipITs property value * adding debug output * debugging no tests issue * declaring the compiler plugin testCompile goal to run * reverting to jar packaging type * removing argLine configuration from maven-failsafe-plugin * forcing empty argLine configuration from maven-failsafe-plugin * removing debug flag from integration-tests
1 parent 683cc6d commit adefdba

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ EOF
612612
sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
613613
'''
614614
archiveArtifacts(artifacts: "logdir/**/*")
615-
junit(testResults: 'integration-tests/target/failsafe-reports/*.xml')
615+
junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)
616616
}
617617
}
618618
}

integration-tests/pom.xml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<goal>enforce</goal>
128128
</goals>
129129
<configuration>
130-
<skip>${wko.it.skip.enforcer.rules}</skip>
130+
<skip>${skipITs}</skip>
131131
<rules>
132132
<requireEnvironmentVariable>
133133
<message>Set the TWO_CLUSTERS environment variable to true or false to specify whether to run inter-cluster communication tests.</message>
@@ -163,7 +163,7 @@
163163
<artifactId>maven-failsafe-plugin</artifactId>
164164
<configuration>
165165
<encoding>UTF-8</encoding>
166-
<argLine>@{argLine} --add-opens java.base/java.time=ALL-UNNAMED</argLine>
166+
<skipTests>${skipITs}</skipTests>
167167
<argLine>${failsafeArgLine}</argLine>
168168
<failIfNoTests>false</failIfNoTests>
169169
<includes>
@@ -184,7 +184,6 @@
184184
</goals>
185185
<phase>integration-test</phase>
186186
<configuration>
187-
<skipTests>${skipITs}</skipTests>
188187
<systemPropertyVariables>
189188
<java.util.logging.SimpleFormatter.format>&lt;%1$tm-%1$td-%1$tY %1$tH:%1$tM:%1$tS&gt; &lt;%4$s&gt; &lt;%2$s&gt; &lt;%5$s%6$s&gt;%n
190189
</java.util.logging.SimpleFormatter.format>
@@ -341,22 +340,19 @@
341340
<surefireArgLine></surefireArgLine>
342341
<failsafeArgLine></failsafeArgLine>
343342
<skipITs>true</skipITs>
344-
<wko.it.skip.enforcer.rules>true</wko.it.skip.enforcer.rules>
345343
</properties>
346344
</profile>
347345
<profile>
348346
<id>integration-tests</id>
349347
<properties>
350348
<skipITs>false</skipITs>
351-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
352349
<includes-failsafe>**/It*</includes-failsafe>
353350
</properties>
354351
</profile>
355352
<profile>
356353
<id>wls-image-cert</id>
357354
<properties>
358355
<skipITs>false</skipITs>
359-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
360356
<includes-failsafe>
361357
**/ItExternalLbTunneling,
362358
**/ItMiiAuxiliaryImage,
@@ -394,7 +390,6 @@
394390
<id>fmw-pipeline</id>
395391
<properties>
396392
<skipITs>false</skipITs>
397-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
398393
<includes-failsafe>
399394
**/ItMiiAuxiliaryImage,
400395
**/ItMiiAuxiliaryImageCluster,
@@ -415,7 +410,6 @@
415410
<id>fmw-image-cert</id>
416411
<properties>
417412
<skipITs>false</skipITs>
418-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
419413
<includes-failsafe>
420414
**/ItMiiSample,
421415
**/ItFmwDomainInPV,
@@ -429,7 +423,6 @@
429423
<id>fmw-srg</id>
430424
<properties>
431425
<skipITs>false</skipITs>
432-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
433426
<includes-failsafe>
434427
**/ItFmwDomainInPVUsingWLST,
435428
**/ItFmwDomainInPVUsingWDT,
@@ -441,7 +434,6 @@
441434
<id>oke-cert</id>
442435
<properties>
443436
<skipITs>false</skipITs>
444-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
445437
<includes-failsafe>
446438
**/ItMultiDomainModels,
447439
**/ItServerStartPolicy,
@@ -467,7 +459,6 @@
467459
<id>kind-sequential</id>
468460
<properties>
469461
<skipITs>false</skipITs>
470-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
471462
<includes-failsafe>
472463
**/ItT3Channel,
473464
**/ItDedicatedMode,
@@ -482,7 +473,6 @@
482473
<id>wls-srg</id>
483474
<properties>
484475
<skipITs>false</skipITs>
485-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
486476
<includes-failsafe>
487477
**/ItKubernetesEvents,
488478
**/ItMiiAuxiliaryImage,
@@ -497,7 +487,6 @@
497487
<id>toolkits-srg</id>
498488
<properties>
499489
<skipITs>false</skipITs>
500-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
501490
<includes-failsafe>
502491
**/ItMultiDomainModels,
503492
**/ItMiiUpdateDomainConfig,

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@
353353
<id>integration-tests</id>
354354
<properties>
355355
<src-integration-test>${project.basedir}/src/integration-test/java</src-integration-test>
356-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
357356
</properties>
358357
<build>
359358
<plugins>
@@ -630,7 +629,7 @@
630629
<htmlunit-version>2.59.0</htmlunit-version>
631630
<aggregate.report.dir>buildtime-reports/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
632631
<checkstyle.config.location>${root.basedir}/build-tools/checkstyle/customized_google_checks.xml</checkstyle.config.location>
633-
<wko.it.skip.enforcer.rules>false</wko.it.skip.enforcer.rules>
632+
<no-reports>false</no-reports>
634633
</properties>
635634

636635
</project>

0 commit comments

Comments
 (0)