Skip to content

Commit 5b70d51

Browse files
authored
HBASE-28940 Do not run the backwards compatibility tests with the default Hadoop3 version (#6403)
Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Nihal Jain <[email protected]>
1 parent 7e36520 commit 5b70d51

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

dev-support/Jenkinsfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ pipeline {
187187
'''
188188
stash name: "hadoop-${HADOOP3_VERSION}", includes: "hadoop-${HADOOP3_VERSION}-bin.tar.gz"
189189
script {
190-
if (env.HADOOP3_VERSIONS == env.HADOOP3_DEFAULT_VERSION) {
190+
if (env.HADOOP3_VERSION == env.HADOOP3_DEFAULT_VERSION) {
191+
// FIXME: we never unstash this, because we run the packaging tests with the version-specific stashes
191192
stash(name: "hadoop-3", includes: "hadoop-${HADOOP3_VERSION}-bin.tar.gz")
192193
} //if
193194
} //script
@@ -790,6 +791,10 @@ pipeline {
790791
steps {
791792
script {
792793
for (hadoop3_version in hadoop3_versions) {
794+
if (hadoop3_version == env.HADOOP3_DEFAULT_VERSION) {
795+
// We are running the full test suite, no need to run the dev tests too
796+
continue
797+
}
793798
//HADOOP_THREE_VERSION is the environment variable name expected by the nightly shell script
794799
env.HADOOP_THREE_VERSION = hadoop3_version;
795800
env.OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3_BACKWARDS}-${env.HADOOP_THREE_VERSION}"
@@ -1145,6 +1150,10 @@ pipeline {
11451150
"${env.OUTPUT_DIR_RELATIVE_JDK11_HADOOP3}/commentfile",
11461151
"${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3}/commentfile"]
11471152
for (hadoop3_version in hadoop3_versions) {
1153+
if (hadoop3_version == env.HADOOP3_DEFAULT_VERSION) {
1154+
// We haven't run these tests
1155+
continue
1156+
}
11481157
unstash("jdk17-hadoop3-backwards-result-${hadoop3_version}")
11491158
results.add("${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3_BACKWARDS}-${hadoop3_version}/commentfile")
11501159
}

0 commit comments

Comments
 (0)