Skip to content

Commit 9fcb076

Browse files
committed
Merge branch 'mr5004_backport' into 'release/4.2'
Backport fix of ItOnPremCrossDomainTransaction into release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!5007
2 parents c60322d + 35e23c2 commit 9fcb076

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
@@ -537,7 +537,8 @@ EOF
537537
PARALLEL_RUN='false'
538538
elif [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then
539539
PARALLEL_RUN='false'
540-
elif [ -n "${IT_TEST}" ]; then
540+
fi
541+
if [ -n "${IT_TEST}" ]; then
541542
echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
542543
MAVEN_PROFILE_NAME="integration-tests"
543544
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
@@ -484,8 +484,8 @@ public interface TestConstants {
484484

485485
public static final boolean INSTALL_WEBLOGIC = Boolean.valueOf((getNonEmptySystemProperty("wko.it.install.weblogic",
486486
"false")));
487-
public static final String WEBLOGIC_SHIPHOME = getNonEmptySystemProperty("wko.it.wls.shiphome",
488-
"https://home.us.oracle.com/results/release/src141200/fmw_14.1.2.0.0_wls_generic.jar");
487+
public static final String WEBLOGIC_SHIPHOME = System.getenv("WLS_INSTALLERS_BASE_URL")
488+
+ "/results/published/pub/loads/141200/latest/release/src141200/fmw_14.1.2.0.0_wls_generic.jar";
489489

490490
public static final String ORACLE_OPERATOR_NS = "ns-oracle-operator";
491491

0 commit comments

Comments
 (0)