Skip to content

Commit cfc731c

Browse files
rjeberhardrjeberhard
committed
Merge branch 'OWLS-120381' into 'release/4.2'
Add secure domain tests with 14.1.2.0.0 image See merge request weblogic-cloud/weblogic-kubernetes-operator!4782
2 parents 228643f + 62ce242 commit cfc731c

File tree

10 files changed

+1118
-0
lines changed

10 files changed

+1118
-0
lines changed

‎Jenkinsfile.podman

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ EOF
538538
MAVEN_PROFILE_NAME="integration-tests"
539539
echo "-Dit.test=\"${IT_TEST}\"" >> ${WORKSPACE}/.mvn/maven.config
540540
fi
541+
echo "-Dmaven.wagon.http.retryHandler.count=3" >> ${WORKSPACE}/.mvn/maven.config
541542
echo "-Dwko.it.wle.download.url=\"${wle_download_url}\"" >> ${WORKSPACE}/.mvn/maven.config
542543
echo "-Dwko.it.result.root=\"${result_root}\"" >> ${WORKSPACE}/.mvn/maven.config
543544
echo "-Dwko.it.pv.root=\"${pv_root}\"" >> ${WORKSPACE}/.mvn/maven.config

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSecureModeDomain.java

Lines changed: 858 additions & 0 deletions
Large diffs are not rendered by default.

‎integration-tests/src/test/resources/securemodeupgrade/mbean-prod-secure.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
topology:
8+
Name: '@@PROP:DomainName@@'
9+
AdminServerName: adminserver
10+
ServerTemplate:
11+
myserver-template:
12+
Cluster: mycluster
13+
Cluster:
14+
mycluster:
15+
DynamicServers:
16+
ServerTemplate: myserver-template
17+
ServerNamePrefix: mycluster-ms-
18+
DynamicClusterSize: 2
19+
MinDynamicClusterSize: 0
20+
CalculatedListenPorts: false
21+
ProductionModeEnabled: true
22+
appDeployments:
23+
Application:
24+
sample-app:
25+
Target: [
26+
mycluster,
27+
adminserver
28+
]
29+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/mbeansecure-listenport-enabled.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
topology:
8+
Name: '@@PROP:DomainName@@'
9+
AdministrationPortEnabled: false
10+
ListenPortEnabled: true
11+
SSLEnabled: false
12+
AdminServerName: adminserver
13+
ServerTemplate:
14+
myserver-template:
15+
Cluster: mycluster
16+
Cluster:
17+
mycluster:
18+
SecureReplicationEnabled: false
19+
DynamicServers:
20+
ServerTemplate: myserver-template
21+
ServerNamePrefix: mycluster-ms-
22+
DynamicClusterSize: 2
23+
MinDynamicClusterSize: 0
24+
CalculatedListenPorts: false
25+
ProductionModeEnabled: true
26+
appDeployments:
27+
Application:
28+
sample-app:
29+
Target: [
30+
mycluster,
31+
adminserver
32+
]
33+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/prod-global-ssl-enabled.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
ServerStartMode: 'prod'
8+
topology:
9+
Name: '@@PROP:DomainName@@'
10+
SSLEnabled: true
11+
AdminServerName: adminserver
12+
ServerTemplate:
13+
myserver-template:
14+
Cluster: mycluster
15+
Cluster:
16+
mycluster:
17+
DynamicServers:
18+
ServerTemplate: myserver-template
19+
ServerNamePrefix: mycluster-ms-
20+
DynamicClusterSize: 2
21+
MinDynamicClusterSize: 0
22+
CalculatedListenPorts: false
23+
appDeployments:
24+
Application:
25+
sample-app:
26+
Target: [
27+
mycluster,
28+
adminserver
29+
]
30+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/prod-ssl-enabled-partial.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
topology:
8+
Name: '@@PROP:DomainName@@'
9+
AdminServerName: adminserver
10+
Server:
11+
adminserver:
12+
ListenPort: 7001
13+
SSL:
14+
Enabled: true
15+
ListenPort: 7002
16+
ServerTemplate:
17+
myserver-template:
18+
Cluster: mycluster
19+
ListenPort: 8001
20+
Cluster:
21+
mycluster:
22+
DynamicServers:
23+
ServerTemplate: myserver-template
24+
ServerNamePrefix: mycluster-ms-
25+
DynamicClusterSize: 2
26+
MinDynamicClusterSize: 0
27+
CalculatedListenPorts: false
28+
ProductionModeEnabled: true
29+
SecurityConfiguration:
30+
SecureMode:
31+
SecureModeEnabled: false
32+
appDeployments:
33+
Application:
34+
sample-app:
35+
Target: [
36+
mycluster,
37+
adminserver
38+
]
39+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/startmode-prod.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
ServerStartMode: 'prod'
8+
topology:
9+
Name: '@@PROP:DomainName@@'
10+
AdminServerName: adminserver
11+
ServerTemplate:
12+
myserver-template:
13+
Cluster: mycluster
14+
Cluster:
15+
mycluster:
16+
DynamicServers:
17+
ServerTemplate: myserver-template
18+
ServerNamePrefix: mycluster-ms-
19+
DynamicClusterSize: 2
20+
MinDynamicClusterSize: 0
21+
CalculatedListenPorts: false
22+
appDeployments:
23+
Application:
24+
sample-app:
25+
Target: [
26+
mycluster,
27+
adminserver
28+
]
29+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/startmode-secure-ssl-override.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
ServerStartMode: 'secure'
8+
topology:
9+
Name: '@@PROP:DomainName@@'
10+
AdministrationPortEnabled: false
11+
ListenPortEnabled: true
12+
SSLEnabled: false
13+
AdminServerName: adminserver
14+
Server:
15+
adminserver:
16+
ListenPort: 7005
17+
ServerTemplate:
18+
myserver-template:
19+
Cluster: mycluster
20+
Cluster:
21+
mycluster:
22+
SecureReplicationEnabled: false
23+
DynamicServers:
24+
ServerTemplate: myserver-template
25+
ServerNamePrefix: mycluster-ms-
26+
DynamicClusterSize: 2
27+
MinDynamicClusterSize: 0
28+
CalculatedListenPorts: false
29+
appDeployments:
30+
Application:
31+
sample-app:
32+
Target: [
33+
mycluster,
34+
adminserver
35+
]
36+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/startmode-secure.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
ServerStartMode: 'secure'
8+
topology:
9+
Name: '@@PROP:DomainName@@'
10+
AdminServerName: adminserver
11+
ServerTemplate:
12+
myserver-template:
13+
Cluster: mycluster
14+
SSL:
15+
ListenPort: 8500
16+
Cluster:
17+
mycluster:
18+
DynamicServers:
19+
ServerTemplate: myserver-template
20+
ServerNamePrefix: mycluster-ms-
21+
DynamicClusterSize: 2
22+
MinDynamicClusterSize: 0
23+
CalculatedListenPorts: false
24+
appDeployments:
25+
Application:
26+
sample-app:
27+
Target: [
28+
mycluster,
29+
adminserver
30+
]
31+
SourcePath: wlsdeploy/applications/sample-app.ear

‎integration-tests/src/test/resources/securemodeupgrade/startsecure-listenport-enabled.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright (c) 2024, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
domainInfo:
5+
AdminUserName: '@@SECRET:__weblogic-credentials__:username@@'
6+
AdminPassword: '@@SECRET:__weblogic-credentials__:password@@'
7+
ServerStartMode: 'secure'
8+
topology:
9+
Name: '@@PROP:DomainName@@'
10+
ListenPortEnabled: true
11+
SSLEnabled: false
12+
AdminServerName: adminserver
13+
ServerTemplate:
14+
myserver-template:
15+
Cluster: mycluster
16+
Cluster:
17+
mycluster:
18+
SecureReplicationEnabled: false
19+
DynamicServers:
20+
ServerTemplate: myserver-template
21+
ServerNamePrefix: mycluster-ms-
22+
DynamicClusterSize: 2
23+
MinDynamicClusterSize: 0
24+
CalculatedListenPorts: false
25+
appDeployments:
26+
Application:
27+
sample-app:
28+
Target: [
29+
mycluster,
30+
adminserver
31+
]
32+
SourcePath: wlsdeploy/applications/sample-app.ear

0 commit comments

Comments
 (0)