Skip to content

Commit 82271ce

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-117555' into 'release/4.2'
backport MR 4668 and 4657 to release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4674
2 parents 7df42b2 + a0eb73c commit 82271ce

25 files changed

+80
-47
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.verrazzano.weblogic.kubernetes;
@@ -56,6 +56,7 @@
5656
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
5757
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
5858
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
59+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
5960
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
6061
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
6162
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -339,7 +340,7 @@ private File createWdtPropertyFile(String domainName) {
339340

340341
// create a model property file
341342
File domainPropertiesFile = assertDoesNotThrow(()
342-
-> File.createTempFile(wlsModelFilePrefix, ".properties"),
343+
-> File.createTempFile(wlsModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
343344
"Failed to create WLS model properties file");
344345

345346
// create the property file

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
2727
import static oracle.weblogic.kubernetes.TestConstants.OKD;
2828
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
29+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
2930
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
3031
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
3132
import static oracle.weblogic.kubernetes.actions.TestActions.getNextIntrospectVersion;
@@ -166,7 +167,8 @@ private void createNewDynamicCluster() {
166167
logger.info("default channel port: {0}", defaultChannelPort);
167168

168169
// create WLST property file
169-
File wlstPropertiesFile = assertDoesNotThrow(() -> File.createTempFile("wlst", "properties"),
170+
File wlstPropertiesFile =
171+
assertDoesNotThrow(() -> File.createTempFile("wlst", ".properties", new File(RESULTS_TEMPFILE)),
170172
"Creating WLST properties file failed");
171173

172174
Properties p1 = new Properties();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
6767
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6868
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
69+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
6970
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
7071
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_12213;
7172
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -203,7 +204,6 @@ public void initAll(@Namespaces(2) List<String> namespaces) throws ApiException,
203204
// this secret is used only for non-kind cluster
204205
createBaseRepoSecret(domainNamespace);
205206

206-
207207
//start two MySQL database instances
208208
String dbService1 = createMySQLDB("mysqldb-1", "root", "root123", domainNamespace, null);
209209
V1Pod pod = getPod(domainNamespace, null, "mysqldb-1");
@@ -218,7 +218,6 @@ public void initAll(@Namespaces(2) List<String> namespaces) throws ApiException,
218218
dsUrl2 = "jdbc:mysql://" + dbService2 + "." + domainNamespace + ".svc:3306";
219219
logger.info(dsUrl1);
220220
logger.info(dsUrl2);
221-
222221

223222
// build the clusterview application
224223
Path distDir = buildApplication(Paths.get(APP_DIR, "clusterview"),
@@ -237,7 +236,6 @@ public void initAll(@Namespaces(2) List<String> namespaces) throws ApiException,
237236
createJdbcDataSource(dsName1, "root", "root123", dsUrl1);
238237
//deploy application to view server configuration
239238
deployApplication(clusterName + "," + adminServerName);
240-
241239
}
242240

243241
/**
@@ -944,7 +942,7 @@ private void createDomain() {
944942

945943
// create a temporary WebLogic domain property file
946944
File domainPropertiesFile = assertDoesNotThrow(()
947-
-> File.createTempFile("domain", ".properties"),
945+
-> File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE)),
948946
"Failed to create domain properties file");
949947
Properties p = new Properties();
950948
p.setProperty("domain_path", uniquePath);
@@ -1125,7 +1123,7 @@ private void createJdbcDataSource(String dsName, String user, String password, S
11251123
// 12.2.1.3 - com.mysql.jdbc.Driver
11261124
// 12.2.1.4 and above - com.mysql.cj.jdbc.Driver
11271125
// create a temporary WebLogic domain property file
1128-
File domainPropertiesFile = File.createTempFile("domain", "properties");
1126+
File domainPropertiesFile = File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE));
11291127
Properties p = new Properties();
11301128
p.setProperty("admin_host", adminServerPodName);
11311129
p.setProperty("admin_port", Integer.toString(defaultChannelPort));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static oracle.weblogic.kubernetes.TestConstants.HTTP_PROXY;
3030
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3131
import static oracle.weblogic.kubernetes.TestConstants.NO_PROXY;
32+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
3233
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3334
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
3435
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_VERSION;
@@ -287,7 +288,7 @@ private File createWdtPropertyFile(int t3ChannelPort) {
287288

288289
// create a model property file
289290
File domainPropertiesFile = assertDoesNotThrow(() ->
290-
File.createTempFile(fmwModelFilePrefix, "properties"),
291+
File.createTempFile(fmwModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
291292
"Failed to create FMW model properties file");
292293

293294
// create the property file

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
4242
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
4343
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
44+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
4445
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
4546
import static oracle.weblogic.kubernetes.actions.impl.primitive.Image.getImageEnvVar;
4647
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
@@ -179,7 +180,7 @@ void testFmwDomainInPvUsingWlst() {
179180

180181
// create a temporary WebLogic domain property file
181182
File domainPropertiesFile = assertDoesNotThrow(() ->
182-
File.createTempFile("domain", "properties"),
183+
File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE)),
183184
"Failed to create domain properties file");
184185

185186
//get ENV variable from the image

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4747
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
4848
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
49+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
4950
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
5051
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
5152
import static oracle.weblogic.kubernetes.actions.TestActions.createConfigMap;
@@ -792,7 +793,7 @@ private File createWdtPropertyFile(String domainUid, String rcuSchemaPrefix) {
792793

793794
// create a model property file
794795
File domainPropertiesFile = assertDoesNotThrow(() ->
795-
File.createTempFile(fmwModelFilePrefix, ".properties"),
796+
File.createTempFile(fmwModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
796797
"Failed to create FMW model properties file");
797798

798799
// create the property file

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
5050
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
5151
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
52+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
5253
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
5354
import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolume;
5455
import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolumeClaim;
@@ -766,7 +767,7 @@ private File createWdtPropertyFile(String domainName, String rcuSchemaPrefix) {
766767

767768
// create a model property file
768769
File domainPropertiesFile = assertDoesNotThrow(() ->
769-
File.createTempFile(fmwModelFilePrefix, ".properties"),
770+
File.createTempFile(fmwModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
770771
"Failed to create FMW model properties file");
771772

772773
// create the property file

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
4141
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
4242
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
43+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
4344
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
4445
import static oracle.weblogic.kubernetes.actions.impl.primitive.Image.getImageEnvVar;
4546
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
@@ -326,7 +327,7 @@ private File createWlstPropertyFile(int t3ChannelPort) {
326327

327328
// create a temporary WebLogic domain property file
328329
File domainPropertiesFile = assertDoesNotThrow(() ->
329-
File.createTempFile("domain", "properties"),
330+
File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE)),
330331
"Failed to create domain properties file");
331332

332333
// create the property file

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
7979
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
8080
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
81+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
8182
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_PREFIX;
8283
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
8384
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
@@ -305,7 +306,8 @@ void testDomainIntrospectVersionNotRolling() {
305306

306307
logger.info("change the cluster1 size to 3 and verify the introspector runs and updates the domain status");
307308
// create a temporary WebLogic WLST property file
308-
File wlstPropertiesFile = assertDoesNotThrow(() -> File.createTempFile("wlst", "properties"),
309+
File wlstPropertiesFile =
310+
assertDoesNotThrow(() -> File.createTempFile("wlst", ".properties", new File(RESULTS_TEMPFILE)),
309311
"Creating WLST properties file failed");
310312
Properties p1 = new Properties();
311313
p1.setProperty("admin_host", adminServerPodName);
@@ -552,9 +554,9 @@ void testCredentialChange() {
552554
getPodCreationTime(introDomainNamespace, cluster1ManagedServerPodNamePrefix + i));
553555
}
554556

555-
556557
// create a temporary WebLogic WLST property file
557-
File wlstPropertiesFile = assertDoesNotThrow(() -> File.createTempFile("wlst", "properties"),
558+
File wlstPropertiesFile =
559+
assertDoesNotThrow(() -> File.createTempFile("wlst", ".properties", new File(RESULTS_TEMPFILE)),
558560
"Creating WLST properties file failed");
559561
Properties p = new Properties();
560562
p.setProperty("admin_host", adminServerPodName);
@@ -677,7 +679,8 @@ void testCreateNewCluster() {
677679
= getServicePort(introDomainNamespace, getExternalServicePodName(adminServerPodName), "default");
678680

679681
// create a temporary WebLogic WLST property file
680-
File wlstPropertiesFile = assertDoesNotThrow(() -> File.createTempFile("wlst", "properties"),
682+
File wlstPropertiesFile =
683+
assertDoesNotThrow(() -> File.createTempFile("wlst", ".properties", new File(RESULTS_TEMPFILE)),
681684
"Creating WLST properties file failed");
682685
Properties p = new Properties();
683686
p.setProperty("admin_host", adminServerPodName);
@@ -1143,7 +1146,7 @@ private static void createDomain() {
11431146

11441147
// create a temporary WebLogic domain property file
11451148
File domainPropertiesFile = assertDoesNotThrow(() ->
1146-
File.createTempFile("domain", "properties"),
1149+
File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE)),
11471150
"Failed to create domain properties file");
11481151
Properties p = new Properties();
11491152
p.setProperty("domain_path", uniquePath);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import static oracle.weblogic.kubernetes.TestConstants.LOCALE_IMAGE_NAME;
5353
import static oracle.weblogic.kubernetes.TestConstants.LOCALE_IMAGE_TAG;
5454
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
55+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
5556
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
5657
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
5758
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -200,7 +201,8 @@ void testIstioDomainHomeInPv() throws UnknownHostException {
200201
createPVC(pvName, pvcName, domainUid, domainNamespace);
201202

202203
// create a temporary WebLogic domain property file
203-
File domainPropertiesFile = assertDoesNotThrow(() -> File.createTempFile("domain", "properties"),
204+
File domainPropertiesFile =
205+
assertDoesNotThrow(() -> File.createTempFile("domain", ".properties", new File(RESULTS_TEMPFILE)),
204206
"Failed to create domain properties file");
205207
Properties p = new Properties();
206208
p.setProperty("domain_path", "/shared/" + domainNamespace + "/domains");

0 commit comments

Comments
 (0)