From 07b93093befc514049769c8a7db7bc1b0d79c691 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Mon, 28 Oct 2024 06:36:35 +0100
Subject: [PATCH] HBASE-28940 Do not run the backwards compatibility tests with
 the default Hadoop3 version

---
 dev-support/Jenkinsfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 8f89ee5ba517..49096c4751e6 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")
            }