Skip to content

Commit 8d6bdc1

Browse files
authored
Merge pull request #745 from oracle/OWLS-70486
Remove run.sh and its mentions
2 parents c479d27 + 198b815 commit 8d6bdc1

File tree

7 files changed

+12
-3419
lines changed

7 files changed

+12
-3419
lines changed

integration-tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Quick test use cases.
2424
4. verify admin t3 channel port by exec into the admin pod and deploying webapp using the channel port for WLST
2525
5. verify web app load balancing by accessing the webapp using loadBalancerWebPort
2626
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
27-
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.)
27+
7. cluster scale up/down using Operator REST endpoint, webapp load balancing should adjust accordingly.
2828
8. Operator life cycle(destroy and create) should not impact the running domain
2929
9. verify liveness probe by killing managed server 1 process 3 times to kick pod auto-restart
3030
10. shutdown the domain by changing domain serverStartPolicy to NEVER

integration-tests/src/test/resources/statedump.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55

@@ -27,7 +27,6 @@ function state_dump {
2727

2828
mkdir -p ${DUMP_DIR}
2929

30-
# Test output is captured to ${TESTOUT} when run.sh is run stand-alone
3130
# if [ -f ${TESTOUT:-NoSuchFile.out} ]; then
3231
# echo Copying ${TESTOUT} to ${DUMP_DIR}/test_suite.out
3332
# cp ${TESTOUT} ${DUMP_DIR}/test_suite.out

src/integration-tests/bash/archive.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
2-
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55
#
66
# archive.sh <source_dir> <target_dir>
7-
# - internal helper method called by run.sh
7+
# - internal helper method
88
# - archives directory ${1} into ${2}/IntSuite.TIMESTAMP.tar.gz
99
# - deletes all but the 10 newest archives
1010
# - this method doesn't have any configurable env vars

src/integration-tests/bash/cleanup.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55
# -----------------
@@ -19,14 +19,11 @@
1919
# LEASE_ID Set this if you want cleanup to release the
2020
# given lease on a failure.
2121
#
22-
# WERCKER Set this to true if you want cleanup to delete
23-
# tiller (the WERCKER path in run.sh sets up tiller).
22+
# WERCKER Set this to true if you want cleanup to delete tiller
2423
#
2524
# DELETE_FILES Delete local test files, and launch a job to delete PV
2625
# hosted test files (default true).
2726
#
28-
# See the acceptance test 'run.sh' for more details on most of the above.
29-
#
3027
# --------------------
3128
# Detailed Description
3229
# --------------------
@@ -321,7 +318,7 @@ if [ -x "$(command -v helm)" ]; then
321318
helm delete --purge $helm_name
322319
done
323320

324-
# cleanup tiller artifacts that are created in run.sh
321+
# cleanup tiller artifacts
325322
if [ "$WERCKER" = "true" ]; then
326323
cleanup_tiller
327324
fi

src/integration-tests/bash/job.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
2-
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

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

2525
JOB_NAME="weblogic-command-job"
2626

27-
# Customizable env vars. See run.sh for an explanation.
27+
# Customizable env vars. See cleanup.sh for an explanation.
2828

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

0 commit comments

Comments
 (0)