[SkyBench] Allow only s3 for sky benchmark

sky/benchmark/benchmark_utils.py

@@ -20,6 +20,7 @@
 
 import sky
 from sky import backends
+from sky import clouds
 from sky import data
 from sky import global_user_state
 from sky import sky_logging
@@ -170,8 +171,13 @@ def _create_benchmark_bucket() -> Tuple[str, str]:
     # Select the bucket type.
     enabled_clouds = storage_lib.get_cached_enabled_storage_clouds_or_refresh(
         raise_if_no_cloud_access=True)
-    # Already checked by raise_if_no_cloud_access=True.
-    assert enabled_clouds
+    # Sky Benchmark only supports S3 (see _download_remote_dir and
+    # _delete_remote_dir).
+    enabled_clouds = [
+        cloud for cloud in enabled_clouds if cloud in [str(clouds.AWS())]
+    ]
+    assert enabled_clouds, ('No enabled cloud storage found. Sky Benchmark '
+                            'requires GCP or AWS to store logs.')
     bucket_type = data.StoreType.from_cloud(enabled_clouds[0]).value
 
     # Create a benchmark bucket.
@@ -242,14 +248,8 @@ def _download_remote_dir(remote_dir: str, local_dir: str,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             check=True)
-    elif bucket_type == data.StoreType.GCS:
-        remote_dir = f'gs://{remote_dir}'
-        subprocess.run(['gsutil', '-m', 'cp', '-r', remote_dir, local_dir],
-                       stdout=subprocess.DEVNULL,
-                       stderr=subprocess.DEVNULL,
-                       check=True)
     else:
-        raise RuntimeError('Azure Blob Storage is not supported yet.')
+        raise RuntimeError(f'{bucket_type} is not supported yet.')
 
 
 def _delete_remote_dir(remote_dir: str, bucket_type: data.StoreType) -> None:
@@ -260,20 +260,8 @@ def _delete_remote_dir(remote_dir: str, bucket_type: data.StoreType) -> None:
                        stdout=subprocess.DEVNULL,
                        stderr=subprocess.DEVNULL,
                        check=True)
-    elif bucket_type == data.StoreType.GCS:
-        remote_dir = f'gs://{remote_dir}'
-        proc = subprocess.run(['gsutil', '-m', 'rm', '-r', remote_dir],
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE,
-                              check=False)
-        if proc.returncode != 0:
-            stderr = proc.stderr.decode('utf-8')
-            if 'BucketNotFoundException: 404' in stderr:
-                logger.warning(f'Bucket {remote_dir} does not exist. Skip')
-            else:
-                raise RuntimeError(f'Failed to delete {remote_dir}: {stderr}')
     else:
-        raise RuntimeError('Azure Blob Storage is not supported yet.')
+        raise RuntimeError(f'{bucket_type} is not supported yet.')
 
 
 def _read_timestamp(path: str) -> float:

tests/test_smoke.py

@@ -5268,6 +5268,7 @@ def test_multiple_resources():
 @pytest.mark.no_fluidstack  # Requires other clouds to be enabled
 @pytest.mark.no_paperspace  # Requires other clouds to be enabled
 @pytest.mark.no_kubernetes
+@pytest.mark.aws  # SkyBenchmark requires S3 access
 def test_sky_bench(generic_cloud: str):
     name = _get_cluster_name()
     test = Test(