@@ -877,8 +877,9 @@ private void generateInputYaml() throws Exception {
877
877
878
878
private void callCreateDomainScript (String outputDir ) throws Exception {
879
879
880
- // copy create domain py script
881
- if (domainMap .containsKey ("createDomainPyScript" )) {
880
+ // copy create domain py script for domain on pv case
881
+ if (domainMap .containsKey ("createDomainPyScript" )
882
+ && !domainMap .containsKey ("domainHomeImageBase" )) {
882
883
Files .copy (
883
884
new File (BaseTest .getProjectRoot () + "/" + domainMap .get ("createDomainPyScript" ))
884
885
.toPath (),
@@ -890,9 +891,13 @@ private void callCreateDomainScript(String outputDir) throws Exception {
890
891
}
891
892
892
893
StringBuffer createDomainScriptCmd = new StringBuffer (BaseTest .getResultDir ());
894
+
895
+ // call different create-domain.sh based on the domain type
893
896
if (domainMap .containsKey ("domainHomeImageBase" )) {
894
- // clone docker sample from github
897
+
898
+ // clone docker sample from github and copy create domain py script for domain in image case
895
899
gitCloneDockerImagesSample (domainMap );
900
+
896
901
createDomainScriptCmd
897
902
.append (
898
903
"/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain.sh -u " )
@@ -1325,6 +1330,15 @@ private void gitCloneDockerImagesSample(Map domainMap) throws Exception {
1325
1330
+ " "
1326
1331
+ result .stdout ());
1327
1332
}
1333
+
1334
+ // copy create domain py script to cloned location
1335
+ if (domainMap .containsKey ("createDomainPyScript" )) {
1336
+ Files .copy (
1337
+ new File (BaseTest .getProjectRoot () + "/" + domainMap .get ("createDomainPyScript" ))
1338
+ .toPath (),
1339
+ new File (domainHomeImageBuildPath + "/container-scripts/create-wls-domain.py" ).toPath (),
1340
+ StandardCopyOption .REPLACE_EXISTING );
1341
+ }
1328
1342
}
1329
1343
}
1330
1344
0 commit comments