|
@@ -15,13 +15,10 @@
|
|
|
// specific language governing permissions and limitations
|
|
|
// under the License.
|
|
|
|
|
|
-def getGithubAndJiraCreds() {
|
|
|
+def getGithubCreds() {
|
|
|
return [usernamePassword(credentialsId: 'apache-hadoop-at-github.com',
|
|
|
passwordVariable: 'GITHUB_TOKEN',
|
|
|
- usernameVariable: 'GITHUB_USER'),
|
|
|
- usernamePassword(credentialsId: 'hadoopqa-at-asf-jira',
|
|
|
- passwordVariable: 'JIRA_PASSWORD',
|
|
|
- usernameVariable: 'JIRA_USER')]
|
|
|
+ usernameVariable: 'GITHUB_USER')]
|
|
|
}
|
|
|
|
|
|
// Publish JUnit results only if there are XML files under surefire-reports
|
|
@@ -130,7 +127,7 @@ pipeline {
|
|
|
}
|
|
|
|
|
|
steps {
|
|
|
- withCredentials(getGithubAndJiraCreds()) {
|
|
|
+ withCredentials(getGithubCreds()) {
|
|
|
sh '''#!/usr/bin/env bash
|
|
|
|
|
|
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
|
|
@@ -176,7 +173,7 @@ pipeline {
|
|
|
}
|
|
|
|
|
|
steps {
|
|
|
- withCredentials(getGithubAndJiraCreds()) {
|
|
|
+ withCredentials(getGithubCreds()) {
|
|
|
sh '''#!/usr/bin/env bash
|
|
|
|
|
|
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
|
|
@@ -222,7 +219,7 @@ pipeline {
|
|
|
}
|
|
|
|
|
|
steps {
|
|
|
- withCredentials(getGithubAndJiraCreds()) {
|
|
|
+ withCredentials(getGithubCreds()) {
|
|
|
sh '''#!/usr/bin/env bash
|
|
|
|
|
|
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
|
|
@@ -265,7 +262,7 @@ pipeline {
|
|
|
}
|
|
|
|
|
|
steps {
|
|
|
- withCredentials(getGithubAndJiraCreds()) {
|
|
|
+ withCredentials(getGithubCreds()) {
|
|
|
sh '''#!/usr/bin/env bash
|
|
|
|
|
|
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
|