You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2020/02/26 17:40:33 UTC

[hbase] branch HBASE-23876/jdk11-nightly-master updated (2f7ce0e -> eb08237)

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a change to branch HBASE-23876/jdk11-nightly-master
in repository https://gitbox.apache.org/repos/asf/hbase.git.


 discard 2f7ce0e  [DO NOT MERGE] include YETUS-943
     new eb08237  [DO NOT MERGE] include YETUS-943

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2f7ce0e)
            \
             N -- N -- N   refs/heads/HBASE-23876/jdk11-nightly-master (eb08237)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-support/hbase_nightly_yetus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[hbase] 01/01: [DO NOT MERGE] include YETUS-943

Posted by nd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch HBASE-23876/jdk11-nightly-master
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit eb082378ba6f898cef7291f08c4ac12847815648
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Mon Feb 24 14:50:19 2020 -0800

    [DO NOT MERGE] include YETUS-943
---
 dev-support/Jenkinsfile            | 27 ++++++---------------------
 dev-support/hbase_nightly_yetus.sh |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5271d35..69ef246 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
     DEEP_CHECKS = 'maven,mvninstall,compile,javac,unit,htmlout' // run by 'yetus jdkX HadoopY checks'
   }
   parameters {
-    booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.
+    booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: true, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.
 
     Should only be used manually when e.g. there is some non-work-aroundable issue in yetus we are checking a fix for.''')
     booleanParam(name: 'DEBUG', defaultValue: false, description: 'Produce a lot more meta-information.')
@@ -81,26 +81,11 @@ pipeline {
             sh  '''#!/usr/bin/env bash
               set -e
               echo "Ensure we have a copy of Apache Yetus."
-              if [[ true !=  "${USE_YETUS_PRERELEASE}" ]]; then
-                YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
-                echo "Checking for Yetus ${YETUS_RELEASE} in '${YETUS_DIR}'"
-                if ! "${YETUS_DIR}/bin/test-patch" --version >/dev/null 2>&1 ; then
-                  rm -rf "${YETUS_DIR}"
-                  "${WORKSPACE}/component/dev-support/jenkins-scripts/cache-apache-project-artifact.sh" \
-                      --working-dir "${WORKSPACE}/downloads-yetus" \
-                      --keys 'https://www.apache.org/dist/yetus/KEYS' \
-                      "${WORKSPACE}/yetus-${YETUS_RELEASE}-bin.tar.gz" \
-                      "yetus/${YETUS_RELEASE}/apache-yetus-${YETUS_RELEASE}-bin.tar.gz"
-                  mv "yetus-${YETUS_RELEASE}-bin.tar.gz" yetus.tar.gz
-                else
-                  echo "Reusing cached install of Apache Yetus version ${YETUS_RELEASE}."
-                fi
-              else
-                YETUS_DIR="${WORKSPACE}/yetus-git"
-                rm -rf "${YETUS_DIR}"
-                echo "downloading from github"
-                curl -L --fail https://api.github.com/repos/apache/yetus/tarball/HEAD -o yetus.tar.gz
-              fi
+              YETUS_DIR="${WORKSPACE}/yetus-git"
+              rm -rf "${YETUS_DIR}"
+              tarball_url='https://api.github.com/repos/ndimiduk/yetus/tarball/943-jdk-version'
+              echo "downloading from github: ${tarball_url}"
+              curl -L --fail "${tarball_url}" -o yetus.tar.gz
               if [ ! -d "${YETUS_DIR}" ]; then
                 echo "unpacking yetus into '${YETUS_DIR}'"
                 mkdir -p "${YETUS_DIR}"
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index 81a5b3f..8761d86 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -103,7 +103,7 @@ if [[ true !=  "${USE_YETUS_PRERELEASE}" ]]; then
   TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch"
 else
   YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-git/shelldocs/shelldocs.py" "${YETUS_ARGS[@]}")
-  TESTPATCHBIN="${WORKSPACE}/yetus-git/precommit/test-patch.sh"
+  TESTPATCHBIN="${WORKSPACE}/yetus-git/precommit/src/main/shell/test-patch.sh"
 fi
 echo "Launching yetus with command line:"
 echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"