From 66ddfb414ee2fda20167e429c16d1a37e4ed73e1 Mon Sep 17 00:00:00 2001 From: Shanky Sharma Date: Thu, 8 Dec 2022 18:43:53 +0530 Subject: [PATCH] HBASE-22924 GitHUB PR job should use when clause to filter to just PRs (#4915) Signed-off-by: Duo Zhang (cherry picked from commit e1ad781dd9ddc201123a63122e22496ee7f8a4b0) --- dev-support/Jenkinsfile_GitHub | 12 ++++++++++++ dev-support/jenkins_precommit_github_yetus.sh | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub index 753ecaaa5b5a..44443cd697ee 100644 --- a/dev-support/Jenkinsfile_GitHub +++ b/dev-support/Jenkinsfile_GitHub @@ -92,6 +92,10 @@ pipeline { YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}" ASF_NIGHTLIES_GENERAL_CHECK_BASE="${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" } + when { + // this will return true if the pipeline is building a change request, such as a GitHub pull request. + changeRequest() + } steps { dir("${SOURCEDIR}") { checkout scm @@ -215,6 +219,10 @@ pipeline { YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}" SKIP_ERRORPRONE = true } + when { + // this will return true if the pipeline is building a change request, such as a GitHub pull request. + changeRequest() + } steps { dir("${SOURCEDIR}") { checkout scm @@ -348,6 +356,10 @@ pipeline { YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}" SKIP_ERRORPRONE = true } + when { + // this will return true if the pipeline is building a change request, such as a GitHub pull request. + changeRequest() + } steps { dir("${SOURCEDIR}") { checkout scm diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh index f5a7315b2d29..d22351bcf5a8 100755 --- a/dev-support/jenkins_precommit_github_yetus.sh +++ b/dev-support/jenkins_precommit_github_yetus.sh @@ -67,14 +67,6 @@ mkdir -p "${PATCHDIR}" mkdir "${PATCHDIR}/machine" "${SOURCEDIR}/dev-support/gather_machine_environment.sh" "${PATCHDIR}/machine" -# If CHANGE_URL is set (e.g., Github Branch Source plugin), process it. -# Otherwise exit, because we don't want HBase to do a -# full build. We wouldn't normally do this check for smaller -# projects. :) -if [[ -z "${CHANGE_URL}" ]]; then - echo "Full build skipped" > "${PATCHDIR}/report.html" - exit 0 -fi # enable debug output for yetus if [[ "true" = "${DEBUG}" ]]; then YETUS_ARGS+=("--debug")