try run macos test on arm64 once more..

Signed-off-by: Lonnie Liu <[email protected]>

Author: aslonnie

.buildkite/macos/macos.rayci.yml

@@ -101,9 +101,9 @@ steps:
       - macos_wheels
       - oss
     job_env: MACOS
-    instance_type: macos
+    instance_type: macos-arm64
     commands:
-      - RAY_INSTALL_JAVA=1 ./ci/ray_ci/macos/macos_ci.sh run_ray_cpp_and_java
+      - RAY_INSTALL_JAVA=0 ./ci/ray_ci/macos/macos_ci.sh run_ray_cpp_and_java
 
   - label: ":ray: core: :mac: flaky tests"
     key: macos_flaky_tests

ci/ray_ci/macos/macos_ci.sh

@@ -86,11 +86,15 @@ run_core_dashboard_test() {
 }
 
 run_ray_cpp_and_java() {
-  # clang-format is needed by java/test.sh
   # 42 is the universal rayci exit code for test failures
-  pip install clang-format==12.0.1
-  export JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home
-  ./java/test.sh || exit 42
+
+  # Java tests are only supported on old Intel Macs so far
+  if [[ "$(uname -m)" != "arm64" ]]; then
+    # clang-format is needed by java/test.sh
+    pip install clang-format==12.0.1
+    export JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home
+    ./java/test.sh || exit 42
+  fi
   ./ci/ci.sh test_cpp || exit 42
 }
 

cpp/BUILD.bazel

@@ -258,20 +258,28 @@ cc_test(
 
 cc_test(
     name = "cluster_mode_xlang_test",
-    srcs = [
-        "src/ray/test/cluster/cluster_mode_xlang_test.cc",
-    ] + glob([
+    srcs = select({
+        "//conditions:default": [
+            "src/ray/test/cluster/cluster_mode_xlang_test.cc",
+        ],
+        "//bazel:osx_arm64_config": [
+            "src/ray/test/cluster/cluster_mode_xlang_osx_test.cc",
+        ],
+    }) + glob([
         "src/ray/test/cluster/*.h",
     ]),
-    args = [
-        "--ray_code_search_path=$(location //java:libio_ray_ray_test.jar)",
-        "--ray_head_args '--include-dashboard false'",
-    ],
+    args = select({
+        "//conditions:default": [
+            "--ray_code_search_path=$(location //java:libio_ray_ray_test.jar)",
+        ],
+        "//bazel:osx_arm64_config": [],
+    }) + ["--ray_head_args '--include-dashboard false'"],
     copts = COPTS,
-    data = [
-        ":ray_cpp_pkg_files",
-        "//java:libio_ray_ray_test.jar",
-    ],
+    data = [":ray_cpp_pkg_files"] + select({
+        "//conditions:default": ["//java:libio_ray_ray_test.jar"],
+        # Java not supported on Apple silicon.
+        "//bazel:osx_arm64_config": [],
+    }),
     linkstatic = True,
     tags = ["team:core"],
     deps = [

cpp/src/ray/test/cluster/cluster_mode_xlang_osx_test.cc

@@ -0,0 +1,28 @@
+// Copyright 2022 The Ray Authors.
+//
+// Licensed 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.
+
+#include <gtest/gtest.h>
+#include <ray/api.h>
+
+// Java not supported on Apple silicon, so skip the tests.
+TEST(RayClusterModeXLangTest, NotSupportedOnAppleSilicon) {}
+
+int main(int argc, char **argv) {
+  ray::RayConfig config;
+  ray::Init(config, argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
+  int ret = RUN_ALL_TESTS();
+  ray::Shutdown();
+  return ret;
+}