Skip to content

Commit d864e53

Browse files
committed
Pass the domain type to create domain method
1 parent 2f49e81 commit d864e53

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class ItSitConfigDomainInImage extends SitConfig {
2222
@BeforeClass
2323
public static void staticPrepare() throws Exception {
2424
SitConfig.staticPrepare(
25+
DOMAININIMAGE_WLST_YAML,
2526
"integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config-inimage.py");
2627
}
2728

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class ItSitConfigDomainInPV extends SitConfig {
2121
@BeforeClass
2222
public static void staticPrepare() throws Exception {
2323
SitConfig.staticPrepare(
24+
DOMAINONPV_WLST_YAML,
2425
"integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py");
2526
}
2627

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public class SitConfig extends BaseTest {
5252
* @throws Exception when the initialization, creating directories , copying files and domain
5353
* creation fails.
5454
*/
55-
protected static void staticPrepare(String domainScript) throws Exception {
55+
protected static void staticPrepare(String domainInputYaml, String domainScript)
56+
throws Exception {
5657
// initialize test properties and create the directories
5758
if (!QUICKTEST) {
5859
// initialize test properties and create the directories
@@ -85,7 +86,7 @@ protected static void staticPrepare(String domainScript) throws Exception {
8586
};
8687
copySitConfigFiles(files, "test-secrets");
8788
// create weblogic domain with configOverrides
88-
domain = createSitConfigDomain(domainScript);
89+
domain = createSitConfigDomain(domainInputYaml, domainScript);
8990
Assert.assertNotNull(domain);
9091
domainYaml =
9192
BaseTest.getUserProjectsDir()
@@ -131,9 +132,10 @@ protected static void staticUnPrepare() throws Exception {
131132
* @return - created domain
132133
* @throws Exception - if it cannot create the domain
133134
*/
134-
private static Domain createSitConfigDomain(String domainScript) throws Exception {
135+
private static Domain createSitConfigDomain(String domainInputYaml, String domainScript)
136+
throws Exception {
135137
// load input yaml to map and add configOverrides
136-
Map<String, Object> domainMap = TestUtils.loadYaml(DOMAININIMAGE_WLST_YAML);
138+
Map<String, Object> domainMap = TestUtils.loadYaml(domainInputYaml);
137139
domainMap.put("configOverrides", "sitconfigcm");
138140
domainMap.put("configOverridesFile", configOverrideDir);
139141
domainMap.put("domainUID", DOMAINUID);

0 commit comments

Comments
 (0)