Skip to content

Commit 7bc8b04

Browse files
committed
Merge branch 'nightlyfix-03132024' into 'main'
remove unused code and fix quotation See merge request weblogic-cloud/weblogic-kubernetes-operator!4617
2 parents 88fc504 + e64de2d commit 7bc8b04

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 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.weblogic.kubernetes.actions.impl;
@@ -766,31 +766,20 @@ public static boolean scaleClusterWithScalingActionScript(String clusterName,
766766
return false;
767767
}
768768

769-
// create $DOMAIN_HOME/bin/scripts directory on admin server pod
770-
logger.info("Creating directory {0}/bin/scripts on admin server pod", domainHomeLocation);
771-
testUntil(
772-
() -> executeCommandOnPod(adminPod, null, true,
773-
"/bin/sh", "-c", "mkdir -p " + domainHomeLocation + "/bin/scripts"),
774-
logger,
775-
"Creating directory {0}/bin/scripts on admin server pod",
776-
domainHomeLocation);
777-
778769
logger.info("Copying scalingAction.sh to admin server pod");
779770
testUntil(
780771
() -> copyFileToPod(domainNamespace, adminServerPodName, null,
781772
Paths.get(PROJECT_ROOT + "/../operator/scripts/scaling/scalingAction.sh"),
782773
Paths.get("/u01/scalingAction.sh")),
783774
logger,
784775
"Copying scalingAction.sh to admin server pod");
785-
// Paths.get(domainHomeLocation + "/bin/scripts/scalingAction.sh")),
786776

787777
logger.info("Adding execute mode for scalingAction.sh");
788778
testUntil(
789779
() -> executeCommandOnPod(adminPod, null, true,
790780
"/bin/sh", "-c", "chmod +x /u01/scalingAction.sh"),
791781
logger,
792782
"Adding execute mode for scalingAction.sh");
793-
// "/bin/sh", "-c", "chmod +x " + domainHomeLocation + "/bin/scripts/scalingAction.sh"),
794783

795784
if (!scalingAction.equals("scaleUp") && !scalingAction.equals("scaleDown")) {
796785
logger.info("Set scaleAction to either scaleUp or scaleDown");

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ApplicationUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,7 @@ public static boolean verifyAdminServerRESTAccessInAdminPod(String adminServerPo
520520
.append(":")
521521
.append(password)
522522
.append(" http://" + adminServerPodName + ":" + adminPort)
523-
.append("/management/tenant-monitoring/servers/ --silent --show-error -o /dev/null -w %{http_code} && ")
524-
.append("echo ${status}");
523+
.append("/management/tenant-monitoring/servers/ --silent --show-error -o /dev/null -w %{http_code}\"");
525524
logger.info("checkRestConsole : curl command {0}", new String(curlCmd));
526525
try {
527526
ExecResult result = ExecCommand.exec(new String(curlCmd), true);

0 commit comments

Comments
 (0)