Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion dev-support/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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")
}
Expand Down