Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion integration-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Quick test use cases.
4. verify admin t3 channel port by exec into the admin pod and deploying webapp using the channel port for WLST
5. verify web app load balancing by accessing the webapp using loadBalancerWebPort
6. verify domain life cycle(destroy and create) should not any impact on Operator managing the domain and web app load balancing and admin external service
7. cluster scale up/down using Operator REST endpoint, webapp load balancing should adjust accordingly. (run.sh does scaling by editing the replicas in domain-custom-resource.yaml.)
7. cluster scale up/down using Operator REST endpoint, webapp load balancing should adjust accordingly.
8. Operator life cycle(destroy and create) should not impact the running domain
9. verify liveness probe by killing managed server 1 process 3 times to kick pod auto-restart
10. shutdown the domain by changing domain serverStartPolicy to NEVER
Expand Down
3 changes: 1 addition & 2 deletions integration-tests/src/test/resources/statedump.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.


Expand Down Expand Up @@ -27,7 +27,6 @@ function state_dump {

mkdir -p ${DUMP_DIR}

# Test output is captured to ${TESTOUT} when run.sh is run stand-alone
# if [ -f ${TESTOUT:-NoSuchFile.out} ]; then
# echo Copying ${TESTOUT} to ${DUMP_DIR}/test_suite.out
# cp ${TESTOUT} ${DUMP_DIR}/test_suite.out
Expand Down
4 changes: 2 additions & 2 deletions src/integration-tests/bash/archive.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.

#
# archive.sh <source_dir> <target_dir>
# - internal helper method called by run.sh
# - internal helper method
# - archives directory ${1} into ${2}/IntSuite.TIMESTAMP.tar.gz
# - deletes all but the 10 newest archives
# - this method doesn't have any configurable env vars
Expand Down
9 changes: 3 additions & 6 deletions src/integration-tests/bash/cleanup.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.

# -----------------
Expand All @@ -19,14 +19,11 @@
# LEASE_ID Set this if you want cleanup to release the
# given lease on a failure.
#
# WERCKER Set this to true if you want cleanup to delete
# tiller (the WERCKER path in run.sh sets up tiller).
# WERCKER Set this to true if you want cleanup to delete tiller
#
# DELETE_FILES Delete local test files, and launch a job to delete PV
# hosted test files (default true).
#
# See the acceptance test 'run.sh' for more details on most of the above.
#
# --------------------
# Detailed Description
# --------------------
Expand Down Expand Up @@ -321,7 +318,7 @@ if [ -x "$(command -v helm)" ]; then
helm delete --purge $helm_name
done

# cleanup tiller artifacts that are created in run.sh
# cleanup tiller artifacts
if [ "$WERCKER" = "true" ]; then
cleanup_tiller
fi
Expand Down
8 changes: 4 additions & 4 deletions src/integration-tests/bash/job.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.

#
# job.sh <command> [<optarg1>] [<optarg2>] ...
#
# This is a helper script called by run.sh & cleanup.sh. It runs the given bash
# This is a helper script called by cleanup.sh. It runs the given bash
# command in a kubernetes job. It also embeds the 'archive.sh' script
# internally in its /scripts volume.
#
# There are two configurable env vars - PV_ROOT and RESULT_ROOT. See run.sh for
# There are two configurable env vars - PV_ROOT and RESULT_ROOT. See cleanup.sh for
# a description.
#
# The command and each optarg argument must have no internal spaces.
Expand All @@ -24,7 +24,7 @@

JOB_NAME="weblogic-command-job"

# Customizable env vars. See run.sh for an explanation.
# Customizable env vars. See cleanup.sh for an explanation.

echo "@@ Begin kubernetes job to run a command. Job name='$JOB_NAME'. Command='$*'."

Expand Down
Loading