(hbase) branch branch-2.6 updated: HBASE-28940 Do not run the backwards compatibility tests with the default Hadoop3 version (#6403)

[stoty]

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

stoty pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new ce2f428e129 HBASE-28940 Do not run the backwards compatibility tests 
with the default Hadoop3 version (#6403)
ce2f428e129 is described below

commit ce2f428e129d997ea47b2f91966ed34d69bbaae4
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Oct 29 08:14:17 2024 +0100

    HBASE-28940 Do not run the backwards compatibility tests with the default 
Hadoop3 version (#6403)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    Signed-off-by: Nihal Jain <nihalj...@apache.org>
    (cherry picked from commit 5b70d51747b43506aa62b474b49c1b6971370913)
---
 dev-support/Jenkinsfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 4357bb0d0cc..e208017c9a8 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -187,7 +187,8 @@ pipeline {
                   '''
                   stash name: "hadoop-${HADOOP3_VERSION}", includes: 
"hadoop-${HADOOP3_VERSION}-bin.tar.gz"
                   script {
-                    if (env.HADOOP3_VERSIONS == env.HADOOP3_DEFAULT_VERSION) {
+                    if (env.HADOOP3_VERSION == env.HADOOP3_DEFAULT_VERSION) {
+                      // FIXME: we never unstash this, because we run the 
packaging tests with the version-specific stashes
                       stash(name: "hadoop-3", includes: 
"hadoop-${HADOOP3_VERSION}-bin.tar.gz")
                     } //if
                   } //script
@@ -790,6 +791,10 @@ pipeline {
           steps {
             script {
               for (hadoop3_version in hadoop3_versions) {
+                if (hadoop3_version == env.HADOOP3_DEFAULT_VERSION) {
+                  // We are running the full test suite, no need to run the 
dev tests too
+                  continue
+                }
                 //HADOOP_THREE_VERSION is the environment variable name 
expected by the nightly shell script
                 env.HADOOP_THREE_VERSION = hadoop3_version;
                 env.OUTPUT_DIR_RELATIVE = 
"${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3_BACKWARDS}-${env.HADOOP_THREE_VERSION}"
@@ -1145,6 +1150,10 @@ pipeline {
                           
"${env.OUTPUT_DIR_RELATIVE_JDK11_HADOOP3}/commentfile",
                           
"${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3}/commentfile"]
            for (hadoop3_version in hadoop3_versions) {
+             if (hadoop3_version == env.HADOOP3_DEFAULT_VERSION) {
+                // We haven't run these tests
+                continue
+            }
              unstash("jdk17-hadoop3-backwards-result-${hadoop3_version}")
                
results.add("${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3_BACKWARDS}-${hadoop3_version}/commentfile")
            }