From 0f2ce08b673ac33ae53400e22b376553d193016b Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Sat, 2 Nov 2019 19:48:21 -0700
Subject: [PATCH 1/2] [SPARK-24152][R] Disable check-cran from run-tests.sh

---
 R/run-tests.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/R/run-tests.sh b/R/run-tests.sh
index 86bd8aad5f113..d8807d165de43 100755
--- a/R/run-tests.sh
+++ b/R/run-tests.sh
@@ -32,8 +32,9 @@ NUM_TEST_WARNING="$(grep -c -e 'Warnings ----------------' $LOGFILE)"
 CRAN_CHECK_LOG_FILE=$FWDIR/cran-check.out
 rm -f $CRAN_CHECK_LOG_FILE
 
-NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE
-FAILED=$((PIPESTATUS[0]||$FAILED))
+# SPARK-24152 We will add this test back as a separate Jenkins job
+# NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE
+# FAILED=$((PIPESTATUS[0]||$FAILED))
 
 NUM_CRAN_WARNING="$(grep -c WARNING$ $CRAN_CHECK_LOG_FILE)"
 NUM_CRAN_ERROR="$(grep -c ERROR$ $CRAN_CHECK_LOG_FILE)"

From 235c3af3c79a771c97f4f80985f5f094bbbdd1c1 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Sat, 2 Nov 2019 20:25:59 -0700
Subject: [PATCH 2/2] Add empty result file

---
 R/run-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/R/run-tests.sh b/R/run-tests.sh
index d8807d165de43..27537bf3f7c2f 100755
--- a/R/run-tests.sh
+++ b/R/run-tests.sh
@@ -35,6 +35,7 @@ rm -f $CRAN_CHECK_LOG_FILE
 # SPARK-24152 We will add this test back as a separate Jenkins job
 # NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE
 # FAILED=$((PIPESTATUS[0]||$FAILED))
+touch $CRAN_CHECK_LOG_FILE
 
 NUM_CRAN_WARNING="$(grep -c WARNING$ $CRAN_CHECK_LOG_FILE)"
 NUM_CRAN_ERROR="$(grep -c ERROR$ $CRAN_CHECK_LOG_FILE)"