Skip to content

Commit 26529d0

Browse files
Rebase with trunk
1 parent 437eccf commit 26529d0

File tree

1 file changed

+46
-46
lines changed

1 file changed

+46
-46
lines changed

dev-support/Jenkinsfile

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -90,60 +90,60 @@ pipeline {
9090
}
9191
}
9292

93-
// This is an optional stage which runs only when there's a change in
94-
// C++/C++ build/platform.
95-
// This stage serves as a means of cross platform validation, which is
96-
// really needed to ensure that any C++ related/platform change doesn't
97-
// break the Hadoop build on Centos 7.
98-
stage ('precommit-run Centos 7') {
99-
environment {
100-
SOURCEDIR = "${WORKSPACE}/centos-7/src"
101-
PATCHDIR = "${WORKSPACE}/centos-7/out"
102-
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_centos_7"
103-
IS_OPTIONAL = 1
104-
}
93+
stage ('platform validation') {
94+
parallel {
95+
// This is an optional stage which runs only when there's a change in
96+
// C++/C++ build/platform.
97+
// This stage serves as a means of cross platform validation, which is
98+
// really needed to ensure that any C++ related/platform change doesn't
99+
// break the Hadoop build on Centos 7.
100+
stage ('precommit-run Centos 7') {
101+
environment {
102+
SOURCEDIR = "${WORKSPACE}/centos-7/src"
103+
PATCHDIR = "${WORKSPACE}/centos-7/out"
104+
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_centos_7"
105+
IS_OPTIONAL = 1
106+
}
105107

106-
steps {
107-
withCredentials(
108-
[usernamePassword(credentialsId: 'apache-hadoop-at-github.202132.xyz',
109-
passwordVariable: 'GITHUB_TOKEN',
110-
usernameVariable: 'GITHUB_USER'),
111-
usernamePassword(credentialsId: 'hadoopqa-at-asf-jira',
112-
passwordVariable: 'JIRA_PASSWORD',
113-
usernameVariable: 'JIRA_USER')]) {
114-
sh '''#!/usr/bin/env bash
115-
116-
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
117-
"${SOURCEDIR}/dev-support/jenkins.sh" run_ci
118-
'''
119-
}
120-
}
108+
steps {
109+
withCredentials(
110+
[usernamePassword(credentialsId: 'apache-hadoop-at-github.202132.xyz',
111+
passwordVariable: 'GITHUB_TOKEN',
112+
usernameVariable: 'GITHUB_USER'),
113+
usernamePassword(credentialsId: 'hadoopqa-at-asf-jira',
114+
passwordVariable: 'JIRA_PASSWORD',
115+
usernameVariable: 'JIRA_USER')]) {
116+
sh '''#!/usr/bin/env bash
121117
122-
post {
123-
// Since this is an optional platform, we want to copy the artifacts
124-
// and archive it only if the build fails, to help with debugging.
125-
failure {
126-
sh '''#!/usr/bin/env bash
118+
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
119+
"${SOURCEDIR}/dev-support/jenkins.sh" run_ci
120+
'''
121+
}
122+
}
127123

128-
cp -Rp "${WORKSPACE}/centos-7/out" "${WORKSPACE}"
129-
'''
130-
archiveArtifacts "out/**"
131-
}
124+
post {
125+
// Since this is an optional platform, we want to copy the artifacts
126+
// and archive it only if the build fails, to help with debugging.
127+
failure {
128+
sh '''#!/usr/bin/env bash
132129
133-
cleanup() {
134-
script {
135-
sh '''#!/usr/bin/env bash
130+
cp -Rp "${WORKSPACE}/centos-7/out" "${WORKSPACE}"
131+
'''
132+
archiveArtifacts "out/**"
133+
}
136134

137-
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
138-
"${SOURCEDIR}/dev-support/jenkins.sh" cleanup_ci_proc
139-
'''
135+
cleanup() {
136+
script {
137+
sh '''#!/usr/bin/env bash
138+
139+
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
140+
"${SOURCEDIR}/dev-support/jenkins.sh" cleanup_ci_proc
141+
'''
142+
}
143+
}
140144
}
141145
}
142-
}
143-
}
144146

145-
stage ('platform validation') {
146-
parallel {
147147
// This is an optional stage which runs only when there's a change in
148148
// C++/C++ build/platform.
149149
// This stage serves as a means of cross platform validation, which is

0 commit comments

Comments
 (0)