From 206d0a02f2148d497ca2edd5d964a33af95516f3 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Mon, 10 Aug 2020 09:53:16 +0800
Subject: [PATCH] HBASE-24838 The pre commit job fails to archive surefire
 reports (#2224)

Signed-off-by: Sean Busbey <busbey@apache.org>
---
 dev-support/Jenkinsfile_GitHub | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 02eb46b4ff7..4547c670521 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -101,7 +101,7 @@ pipeline {
                                   passwordVariable: 'GITHUB_PASSWORD',
                                   usernameVariable: 'GITHUB_USER'
                                 )]) {
-                                sh label: 'test-patch', script: '''
+                                sh label: 'test-patch', script: '''#!/bin/bash -e
                                     hostname -a ; pwd ; ls -la
                                     printenv 2>&1 | sort
                                     echo "[INFO] Launching Yetus via ${YETUS_DRIVER}"
@@ -128,7 +128,7 @@ pipeline {
                         // Jenkins pipeline jobs fill slaves on PRs without this :(
                         cleanup() {
                             script {
-                                sh label: 'Cleanup workspace', script: '''
+                                sh label: 'Cleanup workspace', script: '''#!/bin/bash -e
                                     # See YETUS-764
                                     if [ -f "${PATCHDIR}/pidfile.txt" ]; then
                                       echo "test-patch process appears to still be running: killing"
@@ -187,7 +187,7 @@ pipeline {
                                 passwordVariable: 'GITHUB_PASSWORD',
                                 usernameVariable: 'GITHUB_USER'
                               )]) {
-                                sh label: 'test-patch', script: '''
+                                sh label: 'test-patch', script: '''#!/bin/bash -e
                                     hostname -a ; pwd ; ls -la
                                     printenv 2>&1 | sort
                                     echo "[INFO] Launching Yetus via ${YETUS_DRIVER}"
@@ -199,7 +199,7 @@ pipeline {
                     post {
                         always {
                             junit testResults: "${WORKDIR_REL}/${SRC_REL}/**/target/**/TEST-*.xml", allowEmptyResults: true
-                            sh label: 'zip surefire reports', script: '''
+                            sh label: 'zip surefire reports', script: '''#!/bin/bash -e
                                 if [ -d "${PATCHDIR}/archiver" ]; then
                                   count=$(find "${PATCHDIR}/archiver" -type f | wc -l)
                                   if [[ 0 -ne ${count} ]]; then
@@ -228,7 +228,7 @@ pipeline {
                         // Jenkins pipeline jobs fill slaves on PRs without this :(
                         cleanup() {
                             script {
-                                sh label: 'Cleanup workspace', script: '''
+                                sh label: 'Cleanup workspace', script: '''#!/bin/bash -e
                                     # See YETUS-764
                                     if [ -f "${PATCHDIR}/pidfile.txt" ]; then
                                       echo "test-patch process appears to still be running: killing"
@@ -287,7 +287,7 @@ pipeline {
                                 passwordVariable: 'GITHUB_PASSWORD',
                                 usernameVariable: 'GITHUB_USER'
                               )]) {
-                                sh label: 'test-patch', script: '''
+                                sh label: 'test-patch', script: '''#!/bin/bash -e
                                     hostname -a ; pwd ; ls -la
                                     printenv 2>&1 | sort
                                     echo "[INFO] Launching Yetus via ${YETUS_DRIVER}"
@@ -299,7 +299,7 @@ pipeline {
                     post {
                         always {
                             junit testResults: "${WORKDIR_REL}/${SRC_REL}/**/target/**/TEST-*.xml", allowEmptyResults: true
-                            sh label: 'zip surefire reports', script: '''
+                            sh label: 'zip surefire reports', script: '''#!/bin/bash -e
                                 if [ -d "${PATCHDIR}/archiver" ]; then
                                   count=$(find "${PATCHDIR}/archiver" -type f | wc -l)
                                   if [[ 0 -ne ${count} ]]; then
@@ -328,7 +328,7 @@ pipeline {
                         // Jenkins pipeline jobs fill slaves on PRs without this :(
                         cleanup() {
                             script {
-                                sh label: 'Cleanup workspace', script: '''
+                                sh label: 'Cleanup workspace', script: '''#!/bin/bash -e
                                     # See YETUS-764
                                     if [ -f "${PATCHDIR}/pidfile.txt" ]; then
                                       echo "test-patch process appears to still be running: killing"
@@ -357,7 +357,7 @@ pipeline {
         // Jenkins pipeline jobs fill slaves on PRs without this :(
         cleanup() {
             script {
-                sh label: 'Cleanup workspace', script: '''
+                sh label: 'Cleanup workspace', script: '''#!/bin/bash -e
                     # See HADOOP-13951
                     chmod -R u+rxw "${WORKSPACE}"
                     '''