From 2d8cb0c20c12e9ae5627004a4d11295af59c08ba Mon Sep 17 00:00:00 2001
From: Harutaka Kawamura <hkawamura0130@gmail.com>
Date: Thu, 6 Jan 2022 00:11:43 +0900
Subject: [PATCH] Remove mleap commands in `.create-test-env.R` (#5217)

* Remove mleap commands in .create-test-env.R

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>

* remove restore keys

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>

* Remove mlflow/R/mlflow/.spark-version

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>

* remove spark cache

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>

* remove if

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>
---
 .github/workflows/master.yml       |  8 --------
 mlflow/R/mlflow/.create-test-env.R | 11 -----------
 mlflow/R/mlflow/.spark-version     |  1 -
 3 files changed, 20 deletions(-)
 delete mode 100644 mlflow/R/mlflow/.spark-version

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index b62dcbff32229..63493c10991c8 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -84,20 +84,12 @@ jobs:
         os_name=$(lsb_release -ds | sed 's/\s/-/g')
         echo "::set-output name=os-name::$os_name"
     - name: Cache R packages
-      if: runner.os != 'Windows'
       uses: actions/cache@v2
       with:
         path: ${{ env.R_LIBS_USER }}
         # We cache R dependencies based on a tuple of the current OS, the R version, and the list of
         # R dependencies
         key: ${{ steps.os-name.outputs.os-name }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-        restore-keys: ${{ steps.os-name.outputs.os-name }}-${{ hashFiles('.github/R-version') }}-1-
-    # Cache spark archive downloaded in `mlflow/R/mlflow/.create-test-env.R`
-    - name: Cache spark archive
-      uses: actions/cache@v2
-      with:
-        path: ~/spark/spark-2.4.5-bin-hadoop2.7
-        key: ${{ hashFiles('mlflow/R/mlflow/.spark-version') }}
     - name: Install system dependencies
       run: |
         sudo apt-get install -y libcurl4-openssl-dev
diff --git a/mlflow/R/mlflow/.create-test-env.R b/mlflow/R/mlflow/.create-test-env.R
index c42babf63d0e2..240a39a5e0472 100644
--- a/mlflow/R/mlflow/.create-test-env.R
+++ b/mlflow/R/mlflow/.create-test-env.R
@@ -13,14 +13,3 @@ reticulate::conda_install("'h5py<3.0.0'", envname = mlflow:::mlflow_conda_env_na
 reticulate::conda_install(Sys.getenv("MLFLOW_HOME", "../../../../."), envname = mlflow:::mlflow_conda_env_name(), pip = TRUE)
 reticulate::conda_install("xgboost", envname = mlflow:::mlflow_conda_env_name())
 reticulate::conda_install(paste0("h2o==", packageVersion("h2o")), envname = mlflow:::mlflow_conda_env_name(), pip = TRUE)
-
-# The default timeout value (60 seconds) can be insufficient for `spark_install` to complete
-options(timeout=60 * 60)
-
-spark_version_file <- "../.spark-version"
-spark_version <- trimws(readChar(spark_version_file, file.info(spark_version_file)$size))
-
-# Install MLeap runtime and required dependencies
-sparklyr::spark_install(version = spark_version, verbose = TRUE)
-mleap::install_maven()
-mleap::install_mleap(version = "0.16.0")
diff --git a/mlflow/R/mlflow/.spark-version b/mlflow/R/mlflow/.spark-version
deleted file mode 100644
index 59aa62c1fa4c2..0000000000000
--- a/mlflow/R/mlflow/.spark-version
+++ /dev/null
@@ -1 +0,0 @@
-2.4.5