goiri commented on code in PR #5062:
URL: https://github.com/apache/hadoop/pull/5062#discussion_r1181972872
##########
dev-support/jenkins.sh:
##########
@@ -114,22 +114,47 @@ function check_ci_run() {
function run_ci() {
TESTPATCHBIN="${WORKSPACE}/${YETUS}/precommit/src/main/shell/test-patch.sh"
- # this must be clean for every run
- if [[ -d "${PATCHDIR}" ]]; then
- rm -rf "${PATCHDIR:?}"
+ if [[ "$IS_WINDOWS" && "$IS_WINDOWS" == 1 ]]; then
+ echo "Building in a Windows environment, skipping some Yetus related
settings"
+ else
+ # run in docker mode and specifically point to our
+ # Dockerfile since we don't want to use the auto-pulled version.
+ YETUS_ARGS+=("--docker")
+ YETUS_ARGS+=("--dockerfile=${DOCKERFILE}")
+ YETUS_ARGS+=("--mvn-custom-repos")
+ YETUS_ARGS+=("--dockermemlimit=22g")
+
+ # test with Java 8 and 11
+ YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-8-openjdk-amd64")
+ YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
+ YETUS_ARGS+=("--multijdktests=compile")
fi
- mkdir -p "${PATCHDIR}"
-
- # if given a JIRA issue, process it. If CHANGE_URL is set
- # (e.g., Github Branch Source plugin), process it.
- # otherwise exit, because we don't want Hadoop to do a
- # full build. We wouldn't normally do this check for smaller
- # projects. :)
- if [[ -n "${JIRA_ISSUE_KEY}" ]]; then
- YETUS_ARGS+=("${JIRA_ISSUE_KEY}")
- elif [[ -z "${CHANGE_URL}" ]]; then
- echo "Full build skipped" >"${PATCHDIR}/report.html"
- exit 0
+
+ if [[ "$IS_NIGHTLY_BUILD" && "$IS_NIGHTLY_BUILD" == 1 ]]; then
+ YETUS_ARGS+=("--empty-patch")
+ YETUS_ARGS+=("--branch=${BRANCH_NAME}")
Review Comment:
Where was this before?
##########
dev-support/bin/hadoop.sh:
##########
@@ -548,17 +575,33 @@ function shadedclient_rebuild
big_console_header "Checking client artifacts on ${repostatus} with shaded
clients"
+ extra="-Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true
-Dspotbugs.skip=true"
+
+ if [[ "$IS_WINDOWS" && "$IS_WINDOWS" == 1 ]]; then
+ if load_hadoop_version; then
+ export
HADOOP_HOME="${SOURCEDIR}/hadoop-dist/target/hadoop-${HADOOP_VERSION}-SNAPSHOT"
+ else
+ yetus_error "[WARNING] Unable to extract the Hadoop version and thus
HADOOP_HOME is not set. Some tests may fail."
+ fi
+
+ extra="-Dhttps.protocols=TLSv1.2 -Pnative-win -Drequire.openssl
-Drequire.test.libhadoop
Review Comment:
Extract to some WINDOWS_FLAGS var or something.
##########
dev-support/bin/hadoop.sh:
##########
@@ -405,7 +424,15 @@ function personality_modules
extra="${extra} ${flags}"
fi
- extra="-Ptest-patch ${extra}"
+ if [[ "$IS_WINDOWS" && "$IS_WINDOWS" == 1 ]]; then
+ extra="-Ptest-patch -Dhttps.protocols=TLSv1.2 -Pnative-win,dist -Dtar
-Drequire.openssl
+ -Drequire.test.libhadoop -Dshell-executable=${BASH_EXECUTABLE}
+ -Dopenssl.prefix=${VCPKG_INSTALLED_PACKAGES}
-Dcmake.prefix.path=${VCPKG_INSTALLED_PACKAGES}
Review Comment:
Put one argument per line to make it easier to read.
##########
dev-support/bin/hadoop.sh:
##########
@@ -548,17 +575,33 @@ function shadedclient_rebuild
big_console_header "Checking client artifacts on ${repostatus} with shaded
clients"
+ extra="-Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true
-Dspotbugs.skip=true"
+
+ if [[ "$IS_WINDOWS" && "$IS_WINDOWS" == 1 ]]; then
+ if load_hadoop_version; then
+ export
HADOOP_HOME="${SOURCEDIR}/hadoop-dist/target/hadoop-${HADOOP_VERSION}-SNAPSHOT"
+ else
+ yetus_error "[WARNING] Unable to extract the Hadoop version and thus
HADOOP_HOME is not set. Some tests may fail."
+ fi
+
+ extra="-Dhttps.protocols=TLSv1.2 -Pnative-win -Drequire.openssl
-Drequire.test.libhadoop
Review Comment:
Aren't we repeating this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
