From b2ae34bdd01600c31d51eaee98acc43ea1ba997f Mon Sep 17 00:00:00 2001 From: "ANTARYAMI.PANIGRAHI@ORACLE.COM" Date: Thu, 27 Jan 2022 16:40:54 +0000 Subject: [PATCH 1/2] Initial check-in --- integration-tests/pom.xml | 16 ++++++++++++++++ kindtest.sh | 7 +++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 7fd74b700e2..4e85155d005 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -338,5 +338,21 @@ + + toolkits-srg + + false + + **/ItParameterizedDomain, + **/ItMiiUpdateDomainConfig, + **/ItMiiAuxiliaryImage, + **/ItMiiNewCreateAuxImage, + **/ItMiiDynamicUpdate, + **/ItMiiSampleWlsMain, + **/ItMiiSampleWlsAux, + **/ItMiiMultiModel + + + diff --git a/kindtest.sh b/kindtest.sh index 8674990c0b7..5d4e5cc99da 100755 --- a/kindtest.sh +++ b/kindtest.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, 2021, Oracle and/or its affiliates. +# Copyright (c) 2020, 2022, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # # 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...' rm -rf "${RESULT_ROOT:?}/*" echo "Run tests..." - -if [ ${test_filter} != "**/It*" ]; then +ome}" = "toolkits-srg":f [ "${test_filter}" != "**/It*" ]; then 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" 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 else - if [ "${maven_profile_name}" = "wls-image-cert" ] || [ "${maven_profile_name}" = "fmw-pipeline" ] || [ "${maven_profile_name}" = "fmw-image-cert" ] || [ "${maven_profile_name}" = "kind-sequential" ]; then + 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 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" 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 else From 2b7fb8bf77cc10472088f12879d9895345713049 Mon Sep 17 00:00:00 2001 From: "ANTARYAMI.PANIGRAHI@ORACLE.COM" Date: Thu, 27 Jan 2022 17:07:06 +0000 Subject: [PATCH 2/2] Fixed the typo --- kindtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kindtest.sh b/kindtest.sh index 5d4e5cc99da..5ae6e4b016a 100755 --- a/kindtest.sh +++ b/kindtest.sh @@ -303,7 +303,7 @@ echo 'Clean up result root...' rm -rf "${RESULT_ROOT:?}/*" echo "Run tests..." -ome}" = "toolkits-srg":f [ "${test_filter}" != "**/It*" ]; then +if [ "${test_filter}" != "**/It*" ]; then 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" 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 else