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.

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

Conversation

hzhao-github
Copy link
Member

@hzhao-github hzhao-github commented Oct 30, 2020

this set of tests added to the new maven profile
ItParameterizedDomain.java
ItServerStartPolicy.java
ItMiiUpdateDomainConfig.java
ItIntrospectVersion.java
ItMiiSample.java,
ItJrfDomainInPV.java,
ItStickySession.java
ItSessionMigration.java

based on the QA wiki:
http://aseng-wiki.****/asengwiki/display/WLSQA/WebLogic+Kubernetes+Operator+Certification

Jenkins job passed

  1. parallel + fmw-image-cert
    https://build.weblogick8s.org:8443/job/wko-tmp/92

  2. parallel + wls-image-cert
    https://build.weblogick8s.org:8443/job/wko-tmp/95/

  3. parallel + integration-tests
    https://build.weblogick8s.org:8443/job/wko-tmp/94/

@hzhao-github hzhao-github requested a review from anpanigr October 30, 2020 18:54
Copy link
Member

@vanajamukkara vanajamukkara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you modify kindtest.sh to use PROFILE env variable if its set, if not use integration-tests as default profile to run. We can add a new parameter in Jenkins for profile.

Copy link
Member

@anpanigr anpanigr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add two profiles (wls-image-cert and fmw-image-cert ) to certify WebLogic Image and FMW images respectively.

kindtest.sh Outdated
@@ -73,6 +75,7 @@ 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"
verify_image_run="false"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
verify_image_run="false"
maven_profile_name="integration-tests"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

kindtest.sh Outdated
@@ -94,6 +97,8 @@ while getopts ":h:n:o:t:v:c:x:p:d:i:" opt; do
;;
i) wit_download_url="${OPTARG}"
;;
m) verify_image_run="${OPTARG}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
m) verify_image_run="${OPTARG}"
m) maven_profile_name="${OPTARG}"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

kindtest.sh Outdated
@@ -237,9 +242,19 @@ 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"
if [ "${verify_image_run}" != "verify-images-tests" ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need this condition, use ${maven_profile_name} in the mvn command

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true. Thanks

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

kindtest.sh Outdated
test_filter="${test_filter_wls}"
elif [ "${maven_profile_name}" = "fmw-image-cert" ]; then
test_filter="${test_filter_fmw}"
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (maven_profile_name) is not defined (the current behaviour) what path it should follows ? It should default to current behavior where it does not take any maven profile.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default is test_filter="**/It*" in line 72

kindtest.sh Outdated
@@ -68,13 +70,16 @@ else
outdir="${WORKSPACE}/logdir/${BUILD_TAG}"
fi
test_filter="**/It*"
test_filter_wls="**/ItParameterizedDomain.java,**/ItServerStartPolicy.java,**/ItMiiUpdateDomainConfig.java,**/ItIntrospectVersion.java,**/ItMiiSample.java,**/ItJrfDomainInPV.java,**/ItStickySession.java,**/ItSessionMigration.java"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are defined in the profile, you don't have to set here

@hzhao-github hzhao-github marked this pull request as ready for review November 9, 2020 18:26
Copy link
Member

@vanajamukkara vanajamukkara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG

@anpanigr
Copy link
Member

anpanigr commented Nov 9, 2020

Can u run the test once in https://build.weblogick8s.org:8443/job/weblogic-kubernetes-operator-kind-new to make sure it does not break the existing jenkin configuration

Copy link
Member

@anpanigr anpanigr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rjeberhard rjeberhard merged commit bb5ab0b into develop Nov 9, 2020
@rjeberhard rjeberhard deleted the maven-image-verify branch January 31, 2022 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants