Skip to content

Commit 92469a3

Browse files
authored
integ test change for FMW image chown=oracle:root (#2299)
1 parent 74813ef commit 92469a3

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/WebLogicImageTool.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,8 @@ private String buildiWitCommand() {
100100
+ " update "
101101
+ " --tag " + params.modelImageName() + ":" + params.modelImageTag()
102102
+ " --fromImage " + params.baseImageName() + ":" + params.baseImageTag()
103-
+ " --wdtDomainType " + params.domainType();
104-
105-
if (params.domainType().equals("WLS")) {
106-
command += " --chown oracle:root";
107-
}
103+
+ " --wdtDomainType " + params.domainType()
104+
+ " --chown oracle:root";
108105

109106
if (params.wdtModelOnly()) {
110107
command += " --wdtModelOnly ";

operator/integration-tests/model-in-image/mii-sample-wrapper/build-model-image.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ function output_dryrun() {
7272
MODEL_YAML_FILES="$(ls $WORKDIR/$MODEL_DIR/*.yaml | xargs | sed 's/ /,/g')"
7373
MODEL_ARCHIVE_FILES=$WORKDIR/$MODEL_DIR/archive.zip
7474
MODEL_VARIABLE_FILES="$(ls $WORKDIR/$MODEL_DIR/*.properties | xargs | sed 's/ /,/g')"
75-
if [ "$WDT_DOMAIN_TYPE" = "WLS" ]; then
76-
CHOWN_ROOT="--chown oracle:root"
77-
fi
75+
CHOWN_ROOT="--chown oracle:root"
7876

7977
cat << EOF
8078

0 commit comments

Comments
 (0)