Skip to content

Commit 2e7520b

Browse files
committed
use default createDomainFilesDir under create-fmw-infrastructure-domain
1 parent abc3765 commit 2e7520b

File tree

5 files changed

+0
-337
lines changed

5 files changed

+0
-337
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ public static void staticPrepare() throws Exception {
4747

4848
// create DB used for jrf domain
4949
OracleDB db = DBUtils.createOracleDB(DB_PROP_FILE);
50-
51-
// copy the integration-tests/src/test/resources/domain-home-on-pv/jrf to
52-
// BaseTest.getResultDir()
53-
TestUtils.exec(
54-
"cp -rf "
55-
+ BaseTest.getProjectRoot()
56-
+ "/integration-tests/src/test/resources/domain-home-on-pv/jrf "
57-
+ BaseTest.getResultDir());
5850
}
5951

6052
/**

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package oracle.kubernetes.operator.utils;
66

77
import java.util.Map;
8-
import oracle.kubernetes.operator.BaseTest;
98

109
/** JRF Domain class with all the utility methods */
1110
public class JRFDomain extends Domain {
@@ -52,10 +51,6 @@ private void updateDomainMapForJRF() throws Exception {
5251
"image",
5352
DBUtils.DEFAULT_FMWINFRA_DOCKER_IMAGENAME + ":" + DBUtils.DEFAULT_FMWINFRA_DOCKER_IMAGETAG);
5453

55-
if (!domainMap.containsKey("domainHomeImageBase")) {
56-
domainMap.put("createDomainFilesDir", BaseTest.getResultDir() + "/jrf");
57-
}
58-
5954
if (System.getenv("IMAGE_PULL_SECRET_FMWINFRA") != null) {
6055
domainMap.put("imagePullSecretName", System.getenv("IMAGE_PULL_SECRET_FMWINFRA"));
6156
} else {

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

integration-tests/src/test/resources/domain-home-on-pv/jrf/createFMWDomain.py

Lines changed: 0 additions & 298 deletions
This file was deleted.

integration-tests/src/test/resources/jrfdomainonpvwlst.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
1717
logHome: /shared/logs/jrfdomain1
1818
createDomainScriptsMountPath: /u01/weblogic
1919
createDomainScriptName: create-domain-job.sh
20-
createDomainFilesDir: integration-tests/src/test/resources/domain-home-on-pv/jrf
2120
domainPVMountPath: /shared
2221
rcuSchemaPrefix: jrfdomain1
2322
rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com

0 commit comments

Comments
 (0)