Skip to content

Commit 8abfb99

Browse files
anpanigrANTARYAMI.PANIGRAHI@ORACLE.COM
andauthored
Backport toolkit-srg profile and updated kindtest.sh to release/3.3 (#2744)
* Initial check-in * Fixed the typo Co-authored-by: ANTARYAMI.PANIGRAHI@ORACLE.COM <anpanigr@phx3182b0a.subnet4ad3phx.devweblogicphx.oraclevcn.com>
1 parent 8205f1c commit 8abfb99

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

integration-tests/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,5 +338,21 @@
338338
</includes-failsafe>
339339
</properties>
340340
</profile>
341+
<profile>
342+
<id>toolkits-srg</id>
343+
<properties>
344+
<skipITs>false</skipITs>
345+
<includes-failsafe>
346+
**/ItParameterizedDomain,
347+
**/ItMiiUpdateDomainConfig,
348+
**/ItMiiAuxiliaryImage,
349+
**/ItMiiNewCreateAuxImage,
350+
**/ItMiiDynamicUpdate,
351+
**/ItMiiSampleWlsMain,
352+
**/ItMiiSampleWlsAux,
353+
**/ItMiiMultiModel
354+
</includes-failsafe>
355+
</properties>
356+
</profile>
341357
</profiles>
342358
</project>

kindtest.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
#
55
# This script provisions a Kubernetes cluster using Kind (https://kind.sigs.k8s.io/) and runs the new
@@ -303,12 +303,11 @@ echo 'Clean up result root...'
303303
rm -rf "${RESULT_ROOT:?}/*"
304304

305305
echo "Run tests..."
306-
307-
if [ ${test_filter} != "**/It*" ]; then
306+
if [ "${test_filter}" != "**/It*" ]; then
308307
echo "Running mvn -Dit.test=${test_filter} -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -Dwle.download.url=${wle_download_url} -DPARALLEL_CLASSES=${parallel_run} -DNUMBER_OF_THREADS=${threads} -pl integration-tests -P ${maven_profile_name} verify"
309308
time mvn -Dit.test="${test_filter}" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs
310309
else
311-
if [ "${maven_profile_name}" = "wls-image-cert" ] || [ "${maven_profile_name}" = "fmw-pipeline" ] || [ "${maven_profile_name}" = "fmw-image-cert" ] || [ "${maven_profile_name}" = "kind-sequential" ]; then
310+
if [ "${maven_profile_name}" = "toolkits-srg" ] || [ "${maven_profile_name}" = "wls-image-cert" ] || [ "${maven_profile_name}" = "fmw-pipeline" ] || [ "${maven_profile_name}" = "fmw-image-cert" ] || [ "${maven_profile_name}" = "kind-sequential" ]; then
312311
echo "Running mvn -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -Dwle.download.url=${wle_download_url} -DPARALLEL_CLASSES=${parallel_run} -DNUMBER_OF_THREADS=${threads} -pl integration-tests -P ${maven_profile_name} verify"
313312
time mvn -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs
314313
else

0 commit comments

Comments
 (0)