Skip to content

Added maven profile to run a set of integration tests for the new image certification #2023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 9, 2020
Merged

Added maven profile to run a set of integration tests for the new image certification #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75b961c
Added maven profile to run a set of integration tests for the new ima…
Oct 30, 2020
1295bff
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…
Oct 30, 2020
051c839
Enabled verify-images-tests in kindtest.sh
Oct 30, 2020
9c922a5
Changed the newly added option from boolean to string in kindtest.sh
Nov 2, 2020
9c305b2
Added one more profile
Nov 3, 2020
b7f97ec
Added one more profile
Nov 3, 2020
ffd9ca6
Changed project name
Nov 5, 2020
d8740ed
A small fix
hzhao-github Nov 5, 2020
8935522
Changed test filter
Nov 6, 2020
2fc8233
Debug
Nov 6, 2020
09520e3
Removed test filter for the profile
Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,5 +246,19 @@
<includes-failsafe>**/It*</includes-failsafe>
</properties>
</profile>
<profile>
<id>wls-image-cert</id>
<properties>
<skipITs>false</skipITs>
<includes-failsafe>**/ItParameterizedDomain.java,**/ItServerStartPolicy.java,**/ItMiiUpdateDomainConfig.java,**/ItIntrospectVersion.java,**/ItMiiSample.java,**/ItJrfDomainInPV.java,**/ItStickySession.java,**/ItSessionMigration.java</includes-failsafe>
</properties>
</profile>
<profile>
<id>fmw-image-cert</id>
<properties>
<skipITs>false</skipITs>
<includes-failsafe>**/ItMiiSample.java,**/ItJrfDomainInPV.java</includes-failsafe>
</properties>
</profile>
</profiles>
</project>
28 changes: 19 additions & 9 deletions kindtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ script="${BASH_SOURCE[0]}"
scriptDir="$( cd "$( dirname "${script}" )" && pwd )"

function usage {
echo "usage: ${script} [-v <version>] [-n <name>] [-o <directory>] [-t <tests>] [-c <name>] [-p true|false] [-x <number_of_threads>] [-d <wdt_download_url>] [-i <wit_download_url>] [-h]"
echo "usage: ${script} [-v <version>] [-n <name>] [-o <directory>] [-t <tests>] [-c <name>] [-p true|false] [-x <number_of_threads>] [-d <wdt_download_url>] [-i <wit_download_url>] [-m <maven_profile_name>] [-h]"
echo " -v Kubernetes version (optional) "
echo " (default: 1.15.11, supported values: 1.18, 1.18.2, 1.17, 1.17.5, 1.16, 1.16.9, 1.15, 1.15.11, 1.14, 1.14.10) "
echo " -n Kind cluster name (optional) "
Expand All @@ -56,6 +56,8 @@ function usage {
echo " (default: https://github.com/oracle/weblogic-deploy-tooling/releases/latest) "
echo " -i WIT download URL"
echo " (default: https://github.com/oracle/weblogic-image-tool/releases/latest) "
echo " -m Run integration-tests or wls-image-cert or fmw-image-cert"
echo " (default: integration-tests, supported values: wls-image-cert, fmw-image-cert) "
echo " -h Help"
exit $1
}
Expand All @@ -73,8 +75,9 @@ parallel_run="false"
threads="2"
wdt_download_url="https://github.com/oracle/weblogic-deploy-tooling/releases/latest"
wit_download_url="https://github.com/oracle/weblogic-image-tool/releases/latest"
maven_profile_name="integration-tests"

while getopts ":h:n:o:t:v:c:x:p:d:i:" opt; do
while getopts ":h:n:o:t:v:c:x:p:d:i:m:" opt; do
case $opt in
v) k8s_version="${OPTARG}"
;;
Expand All @@ -94,6 +97,8 @@ while getopts ":h:n:o:t:v:c:x:p:d:i:" opt; do
;;
i) wit_download_url="${OPTARG}"
;;
m) maven_profile_name="${OPTARG}"
;;
h) usage 0
;;
d) echo "Ignoring -d=${OPTARG}"
Expand Down Expand Up @@ -235,11 +240,16 @@ export JAVA_HOME="${JAVA_HOME:-`type -p java|xargs readlink -f|xargs dirname|xar
echo 'Clean up result root...'
rm -rf "${RESULT_ROOT:?}/*"

echo 'Run tests...'
if [ "${test_filter}" = "ItOperatorUpgrade" ] || [ "${parallel_run}" = "false" ]; then
echo "Running mvn -Dit.test=${test_filter} -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -pl integration-tests -P integration-tests verify"
time mvn -Dit.test="${test_filter}" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -pl integration-tests -P integration-tests verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log"
echo "Run tests..."
if [ "${maven_profile_name}" = "wls-image-cert" ] || [ "${maven_profile_name}" = "fmw-image-cert" ]; then
echo "Running mvn -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -pl integration-tests -P ${maven_profile_name} verify"
time mvn -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log"
else
echo "Running mvn -Dit.test=${test_filter}, !ItOperatorUpgrade, !ItDedicatedMode -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -DPARALLEL_CLASSES=${parallel_run} -DNUMBER_OF_THREADS=${threads} -pl integration-tests -P integration-tests verify"
time mvn -Dit.test="${test_filter}, !ItOperatorUpgrade, !ItDedicatedMode" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P integration-tests verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log"
fi
if [ "${test_filter}" = "ItOperatorUpgrade" ] || [ "${parallel_run}" = "false" ]; then
echo "Running mvn -Dit.test=${test_filter} -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -pl integration-tests -P ${maven_profile_name} verify"
time mvn -Dit.test="${test_filter}" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log"
else
echo "Running mvn -Dit.test=${test_filter}, !ItOperatorUpgrade, !ItDedicatedMode -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -DPARALLEL_CLASSES=${parallel_run} -DNUMBER_OF_THREADS=${threads} -pl integration-tests -P ${maven_profile_name} verify"
time mvn -Dit.test="${test_filter}, !ItOperatorUpgrade, !ItDedicatedMode" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_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"
fi
fi