You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/06/23 07:00:44 UTC

(hbase) branch HBASE-28688 updated (15fdf5f5769 -> 11628e57e4b)

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

zhangduo pushed a change to branch HBASE-28688
in repository https://gitbox.apache.org/repos/asf/hbase.git


 discard 15fdf5f5769 change url
 discard b6854592ba1 add debug
 discard 2098870b172 only run general check
 discard 91e05798ceb HBASE-28688 Correct the usage for blanks ignore options in yetus
     new a92b5bcf147 HBASE-28688 Correct the usage for blanks ignore options in yetus
     new 11628e57e4b only run general check

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   (15fdf5f5769)
            \
             N -- N -- N   refs/heads/HBASE-28688 (11628e57e4b)

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 2 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/blanks-ignore-eol.txt  | 20 ++++++++++++++++++--
 dev-support/blanks-ignore-tabs.txt | 20 ++++++++++++++++++--
 dev-support/hbase-personality.sh   |  2 --
 dev-support/hbase_nightly_yetus.sh |  6 +++---
 4 files changed, 39 insertions(+), 9 deletions(-)


(hbase) 02/02: only run general check

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

zhangduo pushed a commit to branch HBASE-28688
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 11628e57e4b0774ad3e573d90816cdf2924aac22
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Jun 22 15:15:11 2024 +0800

    only run general check
---
 dev-support/Jenkinsfile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index e3315e1de7f..c74536adff3 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
     OUTPUT_DIR_RELATIVE_JDK17_HADOOP3 = 'output-jdk17-hadoop3'
 
     PROJECT = 'hbase'
-    PROJECT_PERSONALITY = 'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
+    PROJECT_PERSONALITY = 'https://raw.githubusercontent.com/apache/hbase/HBASE-28688/dev-support/hbase-personality.sh'
     PERSONALITY_FILE = 'tools/personality.sh'
     // This section of the docs tells folks not to use the javadoc tag. older branches have our old version of the check for said tag.
     AUTHOR_IGNORE_LIST = 'src/main/asciidoc/_chapters/developer.adoc'
@@ -417,6 +417,9 @@ pipeline {
               label 'hbase'
             }
           }
+          when {
+            branch 'branch-2*'
+          }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.DEEP_CHECKS}"
@@ -527,6 +530,9 @@ pipeline {
               label 'hbase'
             }
           }
+          when {
+            branch 'branch-2*'
+          }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.DEEP_CHECKS}"
@@ -634,9 +640,7 @@ pipeline {
 
         stage ('yetus jdk17 hadoop3 checks') {
           when {
-            anyOf {
-              branch 'master';branch 'branch-3'
-            }
+            branch 'branch-2*'
           }
           agent {
             node {
@@ -757,6 +761,9 @@ pipeline {
               label 'hbase-large'
             }
           }
+          when {
+            branch 'branch-2*'
+          }
           tools {
             maven 'maven_latest'
             // this needs to be set to the jdk that ought to be used to build releases on the branch the Jenkinsfile is stored in.


(hbase) 01/02: HBASE-28688 Correct the usage for blanks ignore options in yetus

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

zhangduo pushed a commit to branch HBASE-28688
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit a92b5bcf147e553019965e93a8e88969c26d9a7f
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Jun 22 15:13:23 2024 +0800

    HBASE-28688 Correct the usage for blanks ignore options in yetus
---
 dev-support/Jenkinsfile            |  3 ++-
 dev-support/blanks-ignore-eol.txt  | 19 +++++++++++++++++++
 dev-support/blanks-ignore-tabs.txt | 20 ++++++++++++++++++++
 dev-support/hbase_nightly_yetus.sh | 10 +++++-----
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 227229bf8d8..e3315e1de7f 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,7 +44,8 @@ pipeline {
     PERSONALITY_FILE = 'tools/personality.sh'
     // This section of the docs tells folks not to use the javadoc tag. older branches have our old version of the check for said tag.
     AUTHOR_IGNORE_LIST = 'src/main/asciidoc/_chapters/developer.adoc'
-    BLANKS_IGNORE_LIST = '.*/generated/.*'
+    BLANKS_IGNORE_EOL_FILE = 'dev-support/blanks-ignore-eol.txt'
+    BLANKS_IGNORE_TABS_FILE = 'dev-support/blanks-ignore-tabs.txt'
     // output from surefire; sadly the archive function in yetus only works on file names.
     ARCHIVE_PATTERN_LIST = 'TEST-*.xml,org.apache.h*.txt,*.dumpstream,*.dump'
     // These tests currently have known failures. Once they burn down to 0, remove from here so that new problems will cause a failure.
diff --git a/dev-support/blanks-ignore-eol.txt b/dev-support/blanks-ignore-eol.txt
new file mode 100644
index 00000000000..f33a3069ffe
--- /dev/null
+++ b/dev-support/blanks-ignore-eol.txt
@@ -0,0 +1,19 @@
+##
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+.*/generated/.*
+.*/hbase-examples/src/main/.*/gen-.*/.*
diff --git a/dev-support/blanks-ignore-tabs.txt b/dev-support/blanks-ignore-tabs.txt
new file mode 100644
index 00000000000..0c6e1f362aa
--- /dev/null
+++ b/dev-support/blanks-ignore-tabs.txt
@@ -0,0 +1,20 @@
+##
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+.*/generated/.*
+.*/hbase-examples/src/main/.*/gen-.*/.*
+src/main/asciidoc/.*
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index 3423a7e73c5..f7854b66647 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -20,8 +20,8 @@ declare -i missing_env=0
 # Validate params
 for required_env in "TESTS" "PERSONALITY_FILE" "BASEDIR" "ARCHIVE_PATTERN_LIST" "OUTPUT_DIR_RELATIVE" \
                     "OUTPUT_DIR" "PROJECT" "AUTHOR_IGNORE_LIST" \
-                    "BLANKS_IGNORE_LIST" "BRANCH_NAME" "TESTS_FILTER" "DEBUG" \
-                    "USE_YETUS_PRERELEASE" "WORKSPACE" "YETUS_RELEASE"; do
+                    "BLANKS_IGNORE_EOL_FILE" "BLANKS_IGNORE_TABS_FILE" "BRANCH_NAME" "TESTS_FILTER" \
+                    "DEBUG" "USE_YETUS_PRERELEASE" "WORKSPACE" "YETUS_RELEASE"; do
   if [ -z "${!required_env}" ]; then
     echo "[ERROR] Required environment variable '${required_env}' is not set."
     missing_env=${missing_env}+1
@@ -58,9 +58,9 @@ YETUS_ARGS=("--mvn-custom-repos" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--patch-dir=${OUTPUT_DIR}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--project=${PROJECT}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--resetrepo" "${YETUS_ARGS[@]}")
-YETUS_ARGS=("--author-ignore-list=${AUTHOR_IGNORE_LIST}" "${YETUS_ARGS[@]}")
-YETUS_ARGS=("--blanks-eol-ignore-list=${BLANKS_IGNORE_LIST}" "${YETUS_ARGS[@]}")
-YETUS_ARGS=("--blanks-tabs-ignore-list=${BLANKS_IGNORE_LIST}" "${YETUS_ARGS[@]}")
+YETUS_ARGS=("--author-ignore-list=${BASEDIR}/${AUTHOR_IGNORE_LIST}" "${YETUS_ARGS[@]}")
+YETUS_ARGS=("--blanks-eol-ignore-file=${BASEDIR}/${BLANKS_IGNORE_EOL_FILE}" "${YETUS_ARGS[@]}")
+YETUS_ARGS=("--blanks-tabs-ignore-file=${BASEDIR}/${BLANKS_IGNORE_TABS_FILE}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--sentinel" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")