Merge branch 'master' into SPARK-32940

Author: tanelk

.asf.yaml

@@ -27,3 +27,7 @@ github:
     - jdbc
     - sql
     - spark
+  enabled_merge_buttons:
+    merge: false
+    squash: true
+    rebase: true

.github/PULL_REQUEST_TEMPLATE

@@ -8,8 +8,8 @@ Thanks for sending a pull request!  Here are some tips for you:
   6. If possible, provide a concise example to reproduce the issue for a faster review.
   7. If you want to add a new configuration, please read the guideline first for naming configurations in
      'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
-  8. If you want to add or modify an error message, please read the guideline first:
-     https://spark.apache.org/error-message-guidelines.html
+  8. If you want to add or modify an error type or message, please read the guideline first in
+     'core/src/main/resources/error/README.md'.
 -->
 
 ### What changes were proposed in this pull request?

.github/workflows/benchmark.yml

@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Run benchmarks
 
 on:
@@ -48,6 +67,8 @@ jobs:
       SPARK_BENCHMARK_CUR_SPLIT: ${{ matrix.split }}
       SPARK_GENERATE_BENCHMARK_FILES: 1
       SPARK_LOCAL_IP: localhost
+      # To prevent spark.test.home not being set. See more detail in SPARK-36007.
+      SPARK_HOME: ${{ github.workspace }}
     steps:
     - name: Checkout Spark repository
       uses: actions/checkout@v2