Skip to content

Commit 04d7d38

Browse files
committed
Merge branch 'owls122809' into 'main'
Owls122809 - Port changes from release/4.2 to main for ItOperatorWlsUpgrade See merge request weblogic-cloud/weblogic-kubernetes-operator!4941
2 parents 7f2e651 + 6b51f85 commit 04d7d38

File tree

4 files changed

+294
-152
lines changed

4 files changed

+294
-152
lines changed

Jenkinsfile.podman.upgrade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,8 @@ EOF
541541
PARALLEL_RUN='false'
542542
elif [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then
543543
PARALLEL_RUN='false'
544-
elif [ -n "${IT_TEST}" ]; then
544+
fi
545+
if [ -n "${IT_TEST}" ]; then
545546
echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
546547
MAVEN_PROFILE_NAME="integration-tests"
547548
echo "-Dit.test=\"${IT_TEST}\"" >> ${WORKSPACE}/.mvn/maven.config

0 commit comments

Comments
 (0)