Skip to content

Commit 1a39b22

Browse files
rjeberhardrjeberhard
authored
Merge pull request #573 from oracle/feature/java-integration-tests
shutdown domain in all cases on jenkins and more
2 parents 6266293 + 99bfafc commit 1a39b22

File tree

8 files changed

+574
-77
lines changed

8 files changed

+574
-77
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

Lines changed: 250 additions & 71 deletions
Large diffs are not rendered by default.

‎integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ private void createPV() throws Exception {
612612
weblogicDomainStorageSize = (String) pvMap.get("weblogicDomainStorageSize");
613613

614614
// test NFS for domain5 on JENKINS
615-
if (domainUid.equals("domain5")
615+
if (domainUid.equals("domain6")
616616
&& (System.getenv("JENKINS") != null
617617
&& System.getenv("JENKINS").equalsIgnoreCase("true"))) {
618618
pvMap.put("weblogicDomainStorageType", "NFS");
@@ -863,7 +863,9 @@ private void initialize(String inputYaml) throws Exception {
863863
}
864864

865865
domainMap.put("domainHome", "/shared/domains/" + domainUid);
866-
866+
/* domainMap.put(
867+
"createDomainFilesDir",
868+
BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv"); */
867869
String imageName = "store/oracle/weblogic";
868870
if (System.getenv("IMAGE_NAME_WEBLOGIC") != null) {
869871
imageName = System.getenv("IMAGE_NAME_WEBLOGIC");

‎integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,9 @@ public static Operator createOperator(String opYamlFile) throws Exception {
487487

488488
public static Domain createDomain(String inputYaml) throws Exception {
489489
logger.info("Creating domain with yaml, waiting for the script to complete execution");
490-
Domain domain = new Domain(inputYaml);
491-
domain.verifyDomainCreated();
492-
return domain;
490+
return new Domain(inputYaml);
491+
/* domain.verifyDomainCreated();
492+
return domain; */
493493
}
494494

495495
public static Map<String, Object> loadYaml(String yamlFile) throws Exception {

‎integration-tests/src/test/resources/OperatorIT.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ baseDir=/scratch
55
#wls admin user
66
username=weblogic
77
password=welcome1
8-
maxIterationsPod=50
8+
maxIterationsPod=25
99
waitTimePod=10

‎integration-tests/src/test/resources/domain-home-on-pv/create-domain-auto-sit-config.py

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
4+
def getEnvVar(var):
5+
val=os.environ.get(var)
6+
if val==None:
7+
print "ERROR: Env var ",var, " not set."
8+
sys.exit(1)
9+
return val
10+
11+
# This python script is used to create a WebLogic domain
12+
13+
domain_uid = getEnvVar("DOMAIN_UID")
14+
server_port = int(getEnvVar("MANAGED_SERVER_PORT"))
15+
domain_path = getEnvVar("DOMAIN_HOME")
16+
cluster_name = getEnvVar("CLUSTER_NAME")
17+
admin_server_name = getEnvVar("ADMIN_SERVER_NAME")
18+
admin_server_name_svc = getEnvVar("ADMIN_SERVER_NAME_SVC")
19+
admin_port = int(getEnvVar("ADMIN_PORT"))
20+
domain_name = getEnvVar("DOMAIN_NAME")
21+
t3_channel_port = int(getEnvVar("T3_CHANNEL_PORT"))
22+
t3_public_address = getEnvVar("T3_PUBLIC_ADDRESS")
23+
number_of_ms = int(getEnvVar("CONFIGURED_MANAGED_SERVER_COUNT"))
24+
cluster_type = getEnvVar("CLUSTER_TYPE")
25+
managed_server_name_base = getEnvVar("MANAGED_SERVER_NAME_BASE")
26+
managed_server_name_base_svc = getEnvVar("MANAGED_SERVER_NAME_BASE_SVC")
27+
domain_logs = getEnvVar("DOMAIN_LOGS_DIR")
28+
script_dir = getEnvVar("CREATE_DOMAIN_SCRIPT_DIR")
29+
production_mode_enabled = getEnvVar("PRODUCTION_MODE_ENABLED")
30+
31+
# Read the domain secrets from the common python file
32+
execfile('%s/read-domain-secret.py' % script_dir)
33+
34+
print('domain_path : [%s]' % domain_path);
35+
print('domain_name : [%s]' % domain_name);
36+
print('admin_server_name : [%s]' % admin_server_name);
37+
print('admin_username : [%s]' % admin_username);
38+
print('admin_port : [%s]' % admin_port);
39+
print('cluster_name : [%s]' % cluster_name);
40+
print('server_port : [%s]' % server_port);
41+
# Open default domain template
42+
# ============================
43+
readTemplate("/u01/oracle/wlserver/common/templates/wls/wls.jar")
44+
45+
set('Name', domain_name)
46+
setOption('DomainName', domain_name)
47+
48+
# Configure the Administration Server
49+
# ===================================
50+
cd('/Servers/AdminServer')
51+
# Give incorrect listenaddress, introspector overrides with sit-config
52+
set('ListenAddress', 'junk')
53+
set('ListenPort', admin_port)
54+
set('Name', admin_server_name)
55+
create('AdminServer','Log')
56+
cd('/Servers/AdminServer/Log/AdminServer')
57+
# Give incorrect filelog, introspector overrides with sit-config
58+
set('FileName', 'dirdoesnotexist')
59+
60+
create('T3Channel', 'NetworkAccessPoint')
61+
cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
62+
set('PublicPort', t3_channel_port)
63+
set('PublicAddress', t3_public_address)
64+
# Give incorrect listenaddress, introspector overrides with sit-config
65+
set('ListenAddress', 'junk')
66+
set('ListenPort', t3_channel_port)
67+
68+
69+
# Set the admin user's username and password
70+
# ==========================================
71+
cd('/Security/%s/User/weblogic' % domain_name)
72+
cmo.setName(admin_username)
73+
cmo.setPassword(admin_password)
74+
75+
# Write the domain and close the domain template
76+
# ==============================================
77+
setOption('OverwriteDomain', 'true')
78+
79+
# Create a cluster
80+
# ======================
81+
cd('/')
82+
cl=create(cluster_name, 'Cluster')
83+
84+
if cluster_type == "CONFIGURED":
85+
86+
# Create managed servers
87+
for index in range(0, number_of_ms):
88+
cd('/')
89+
90+
msIndex = index+1
91+
name = '%s%s' % (managed_server_name_base, msIndex)
92+
name_svc = '%s%s' % (managed_server_name_base_svc, msIndex)
93+
94+
create(name, 'Server')
95+
cd('/Servers/%s/' % name )
96+
print('managed server name is %s' % name);
97+
set('ListenAddress', '%s-%s' % (domain_uid, name_svc))
98+
set('ListenPort', server_port)
99+
set('NumOfRetriesBeforeMSIMode', 0)
100+
set('RetryIntervalBeforeMSIMode', 1)
101+
set('Cluster', cluster_name)
102+
103+
else:
104+
print('Configuring Dynamic Cluster %s' % cluster_name)
105+
106+
templateName = cluster_name + "-template"
107+
print('Creating Server Template: %s' % templateName)
108+
st1=create(templateName, 'ServerTemplate')
109+
print('Done creating Server Template: %s' % templateName)
110+
cd('/ServerTemplates/%s' % templateName)
111+
cmo.setListenPort(server_port)
112+
cmo.setListenAddress('%s-%s${id}' % (domain_uid, managed_server_name_base_svc))
113+
cmo.setCluster(cl)
114+
print('Done setting attributes for Server Template: %s' % templateName);
115+
116+
117+
cd('/Clusters/%s' % cluster_name)
118+
create(cluster_name, 'DynamicServers')
119+
cd('DynamicServers/%s' % cluster_name)
120+
set('ServerTemplate', st1)
121+
set('ServerNamePrefix', managed_server_name_base)
122+
set('DynamicClusterSize', number_of_ms)
123+
set('MaxDynamicClusterSize', number_of_ms)
124+
set('CalculatedListenPorts', false)
125+
set('Id', 1)
126+
127+
print('Done setting attributes for Dynamic Cluster: %s' % cluster_name);
128+
129+
# Write Domain
130+
# ============
131+
writeDomain(domain_path)
132+
closeTemplate()
133+
print 'Domain Created'
134+
135+
# Update Domain
136+
readDomain(domain_path)
137+
cd('/')
138+
if production_mode_enabled == "true":
139+
cmo.setProductionModeEnabled(true)
140+
else:
141+
cmo.setProductionModeEnabled(false)
142+
updateDomain()
143+
closeDomain()
144+
print 'Domain Updated'
145+
print 'Done'
146+
147+
# Exit WLST
148+
# =========
149+
exit()

‎integration-tests/src/test/resources/domain-home-on-pv/create-domain-script.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
4+
5+
# Include common utility functions
6+
source ${CREATE_DOMAIN_SCRIPT_DIR}/utility.sh
7+
8+
export DOMAIN_HOME=${DOMAIN_HOME_DIR}
9+
10+
# Create the domain
11+
wlst.sh -skipWLSModuleScanning ${CREATE_DOMAIN_SCRIPT_DIR}/create-domain.py
12+
13+

‎integration-tests/src/test/resources/domain-home-on-pv/create-domain.py

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
4+
def getEnvVar(var):
5+
val=os.environ.get(var)
6+
if val==None:
7+
print "ERROR: Env var ",var, " not set."
8+
sys.exit(1)
9+
return val
10+
11+
# This python script is used to create a WebLogic domain
12+
13+
domain_uid = getEnvVar("DOMAIN_UID")
14+
server_port = int(getEnvVar("MANAGED_SERVER_PORT"))
15+
domain_path = getEnvVar("DOMAIN_HOME")
16+
cluster_name = getEnvVar("CLUSTER_NAME")
17+
admin_server_name = getEnvVar("ADMIN_SERVER_NAME")
18+
admin_server_name_svc = getEnvVar("ADMIN_SERVER_NAME_SVC")
19+
admin_port = int(getEnvVar("ADMIN_PORT"))
20+
domain_name = getEnvVar("DOMAIN_NAME")
21+
t3_channel_port = int(getEnvVar("T3_CHANNEL_PORT"))
22+
t3_public_address = getEnvVar("T3_PUBLIC_ADDRESS")
23+
number_of_ms = int(getEnvVar("CONFIGURED_MANAGED_SERVER_COUNT"))
24+
cluster_type = getEnvVar("CLUSTER_TYPE")
25+
managed_server_name_base = getEnvVar("MANAGED_SERVER_NAME_BASE")
26+
managed_server_name_base_svc = getEnvVar("MANAGED_SERVER_NAME_BASE_SVC")
27+
domain_logs = getEnvVar("DOMAIN_LOGS_DIR")
28+
script_dir = getEnvVar("CREATE_DOMAIN_SCRIPT_DIR")
29+
production_mode_enabled = getEnvVar("PRODUCTION_MODE_ENABLED")
30+
31+
# Read the domain secrets from the common python file
32+
execfile('%s/read-domain-secret.py' % script_dir)
33+
34+
print('domain_path : [%s]' % domain_path);
35+
print('domain_name : [%s]' % domain_name);
36+
print('admin_server_name : [%s]' % admin_server_name);
37+
print('admin_username : [%s]' % admin_username);
38+
print('admin_port : [%s]' % admin_port);
39+
print('cluster_name : [%s]' % cluster_name);
40+
print('server_port : [%s]' % server_port);
41+
# Open default domain template
42+
# ============================
43+
readTemplate("/u01/oracle/wlserver/common/templates/wls/wls.jar")
44+
45+
set('Name', domain_name)
46+
setOption('DomainName', domain_name)
47+
48+
# Configure the Administration Server
49+
# ===================================
50+
cd('/Servers/AdminServer')
51+
# Give incorrect listenaddress, introspector overrides with sit-config
52+
set('ListenAddress', 'junk')
53+
set('ListenPort', admin_port)
54+
set('Name', admin_server_name)
55+
create('AdminServer','Log')
56+
cd('/Servers/AdminServer/Log/AdminServer')
57+
# Give incorrect filelog, introspector overrides with sit-config
58+
set('FileName', 'dirdoesnotexist')
59+
60+
create('T3Channel', 'NetworkAccessPoint')
61+
cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
62+
set('PublicPort', t3_channel_port)
63+
set('PublicAddress', t3_public_address)
64+
# Give incorrect listenaddress, introspector overrides with sit-config
65+
set('ListenAddress', 'junk')
66+
set('ListenPort', t3_channel_port)
67+
68+
69+
# Set the admin user's username and password
70+
# ==========================================
71+
cd('/Security/%s/User/weblogic' % domain_name)
72+
cmo.setName(admin_username)
73+
cmo.setPassword(admin_password)
74+
75+
# Write the domain and close the domain template
76+
# ==============================================
77+
setOption('OverwriteDomain', 'true')
78+
79+
# Create a cluster
80+
# ======================
81+
cd('/')
82+
cl=create(cluster_name, 'Cluster')
83+
84+
if cluster_type == "CONFIGURED":
85+
86+
# Create managed servers
87+
for index in range(0, number_of_ms):
88+
cd('/')
89+
90+
msIndex = index+1
91+
name = '%s%s' % (managed_server_name_base, msIndex)
92+
name_svc = '%s%s' % (managed_server_name_base_svc, msIndex)
93+
94+
create(name, 'Server')
95+
cd('/Servers/%s/' % name )
96+
print('managed server name is %s' % name);
97+
set('ListenAddress', '%s-%s' % (domain_uid, name_svc))
98+
set('ListenPort', server_port)
99+
set('NumOfRetriesBeforeMSIMode', 0)
100+
set('RetryIntervalBeforeMSIMode', 1)
101+
set('Cluster', cluster_name)
102+
103+
else:
104+
print('Configuring Dynamic Cluster %s' % cluster_name)
105+
106+
templateName = cluster_name + "-template"
107+
print('Creating Server Template: %s' % templateName)
108+
st1=create(templateName, 'ServerTemplate')
109+
print('Done creating Server Template: %s' % templateName)
110+
cd('/ServerTemplates/%s' % templateName)
111+
cmo.setListenPort(server_port)
112+
cmo.setListenAddress('%s-%s${id}' % (domain_uid, managed_server_name_base_svc))
113+
cmo.setCluster(cl)
114+
print('Done setting attributes for Server Template: %s' % templateName);
115+
116+
117+
cd('/Clusters/%s' % cluster_name)
118+
create(cluster_name, 'DynamicServers')
119+
cd('DynamicServers/%s' % cluster_name)
120+
set('ServerTemplate', st1)
121+
set('ServerNamePrefix', managed_server_name_base)
122+
set('DynamicClusterSize', number_of_ms)
123+
set('MaxDynamicClusterSize', number_of_ms)
124+
set('CalculatedListenPorts', false)
125+
set('Id', 1)
126+
127+
print('Done setting attributes for Dynamic Cluster: %s' % cluster_name);
128+
129+
# Write Domain
130+
# ============
131+
writeDomain(domain_path)
132+
closeTemplate()
133+
print 'Domain Created'
134+
135+
# Update Domain
136+
readDomain(domain_path)
137+
cd('/')
138+
if production_mode_enabled == "true":
139+
cmo.setProductionModeEnabled(true)
140+
else:
141+
cmo.setProductionModeEnabled(false)
142+
updateDomain()
143+
closeDomain()
144+
print 'Domain Updated'
145+
print 'Done'
146+
147+
# Exit WLST
148+
# =========
149+
exit()

‎integration-tests/src/test/resources/domain11.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
4+
domainUID: domain11
5+
namespace: default

0 commit comments

Comments
 (0)