Skip to content

Commit 158dc92

Browse files
committed
Merge branch 'feature/java-integration-tests' of https://github.com/oracle/weblogic-kubernetes-operator into feature/java-integration-tests
2 parents 33dbc43 + 882542b commit 158dc92

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

integration-tests/README.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Defaults for RESULT_ROOT & PV_ROOT:
6464

6565
| Test Mode | RESULT_ROOT | PV_ROOT | Where initialized |
6666
| --- | --- | --- | --- |
67-
| stand-alone | /scratch/$USER/wl_k8s_test_results | <--same | test defaults |
68-
| Jenkins | /scratch/k8s_dir | <--same | jenkins configuration |
67+
| stand-alone | /scratch/$USER/wl_k8s_test_results | /scratch/$USER/wl_k8s_test_results | test defaults |
68+
| Jenkins | /scratch/k8s_dir | /scratch/k8s_dir | jenkins configuration |
6969
| Wercker | /pipeline/output/k8s_dir | /scratch | wercker.yml |
7070

7171

@@ -79,25 +79,25 @@ Defaults for RESULT_ROOT & PV_ROOT:
7979

8080
'Logical' to 'Physical' K8S PV/PVC mappings:
8181

82-
| Logical | Actual |
83-
| --- | --- |
84-
| job.sh job: | /scratch <--> PV_ROOT on K8S machines |
85-
| domain pod: | /shared <--> PV_ROOT/acceptance_test_pv/persistentVolume-${domain_uid} on K8S machines |
82+
| | Logical | Actual |
83+
| --- | --- | --- |
84+
| job.sh job | /scratch | PV_ROOT on K8S machines |
85+
| domain pod: | /shared | PV_ROOT/acceptance_test_pv/persistentVolume-${domain_uid} on K8S machines |
8686

8787
# Configuration Files
8888

8989
A module "integration-tests" is added in Maven weblogic-kubernetes-operator project.
9090

9191
Below configuration files are used:
92-
```
92+
9393
src/integration-tests/resources/OperatorIT.properties - This file is used for configuring common attributes for all integration tests
9494
```
9595
baseDir=/scratch
9696
username=weblogic
9797
password=welcome1
9898
maxIterationsPod=50
9999
waitTimePod=5
100-
100+
```
101101

102102
src/integration-tests/resources/ITFirstOperator.properties - customized properties for Operator. Any property can be provided here from create-weblogic-operator-inputs.yaml, for all the properties that are not defined here default values in create-weblogic-operator-inputs.yaml are used while generating the operator inputs yaml file.
103103

@@ -161,8 +161,6 @@ Maven and latest Git should be in PATH
161161

162162
export JAVA_HOME
163163

164-
set the optional env vars described below
165-
166164
The tests accepts optional env var overrides:
167165

168166
| Variable | Description |

0 commit comments

Comments
 (0)