Skip to content

Commit 6ee9df1

Browse files
committed
Merge branch 'owls127329' into 'main'
Fix ItOnPremCrossDomainTransaction failures See merge request weblogic-cloud/weblogic-kubernetes-operator!5004
2 parents 62023b0 + e20f697 commit 6ee9df1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Jenkinsfile.podman

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,8 @@ EOF
534534
PARALLEL_RUN='false'
535535
elif [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then
536536
PARALLEL_RUN='false'
537-
elif [ -n "${IT_TEST}" ]; then
537+
fi
538+
if [ -n "${IT_TEST}" ]; then
538539
echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
539540
MAVEN_PROFILE_NAME="integration-tests"
540541
echo "-Dit.test=\"${IT_TEST}\"" >> ${WORKSPACE}/.mvn/maven.config

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ public interface TestConstants {
472472

473473
boolean INSTALL_WEBLOGIC
474474
= Boolean.parseBoolean((getNonEmptySystemProperty("wko.it.install.weblogic", "false")));
475-
String WEBLOGIC_SHIPHOME = getNonEmptySystemProperty("wko.it.wls.shiphome",
476-
"https://home.us.oracle.com/results/release/src141200/fmw_14.1.2.0.0_wls_generic.jar");
475+
String WEBLOGIC_SHIPHOME = System.getenv("WLS_INSTALLERS_BASE_URL")
476+
+ "/results/published/pub/loads/141200/latest/release/src141200/fmw_14.1.2.0.0_wls_generic.jar";
477477

478478
String ORACLE_OPERATOR_NS = "ns-oracle-operator";
479479

0 commit comments

Comments
 (0)