From bccf2f3ef4c8f09f010656f9061a4e323daf132b Mon Sep 17 00:00:00 2001
From: Gautham B A <gautham.bangalore@gmail.com>
Date: Sun, 31 Oct 2021 22:48:23 +0530
Subject: [PATCH] HADOOP-17985. Disable JIRA plugin for Yetus run (#3601)

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
---
 dev-support/Jenkinsfile | 15 ++++++---------
 dev-support/jenkins.sh  |  6 +-----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 7896810d01..0ec32e385d 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -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"
diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh
index 7ead90b5da..1bb080d19c 100644
--- a/dev-support/jenkins.sh
+++ b/dev-support/jenkins.sh
@@ -149,10 +149,6 @@ function run_ci() {
   # enable writing back to Github
   YETUS_ARGS+=("--github-token=${GITHUB_TOKEN}")
 
-  # enable writing back to ASF JIRA
-  YETUS_ARGS+=("--jira-password=${JIRA_PASSWORD}")
-  YETUS_ARGS+=("--jira-user=${JIRA_USER}")
-
   # auto-kill any surefire stragglers during unit test runs
   YETUS_ARGS+=("--reapermode=kill")
 
@@ -173,7 +169,7 @@ function run_ci() {
   YETUS_ARGS+=("--build-url-artifacts=artifact/out")
 
   # plugins to enable
-  YETUS_ARGS+=("--plugins=all")
+  YETUS_ARGS+=("--plugins=all,-jira")
 
   # don't let these tests cause -1s because we aren't really paying that
   # much attention to them