Fix CI: only exclude docker tests on macOS, not OCI builds

OCI images can be built on any platform - they're just tar layers.
The only thing that fails on macOS CI is container_structure_test
because Docker is not available on GitHub-hosted macOS runners.

See: actions/runner#1456

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: greggdonovan

.bcr/presubmit.yml

@@ -7,16 +7,18 @@ bcr_test_module:
     bazel:
       - 8.x
   tasks:
-    run_tests:
-      name: "Build and test (excluding OCI on macOS)"
+    build_all:
+      name: "Build all targets"
       build_targets:
         - "//..."
-      build_flags:
-        - "--build_tag_filters=-oci"
+    # Docker tests excluded because GitHub macOS runners don't have Docker
+    # https://github.com/actions/runner/issues/1456
+    test_non_docker:
+      name: "Test (excluding docker tests)"
       test_targets:
         - "//..."
       test_flags:
-        - "--test_tag_filters=-docker,-oci"
+        - "--test_tag_filters=-docker"
 
 bcr_test_module_linux:
   module_path: ""
@@ -26,9 +28,9 @@ bcr_test_module_linux:
     bazel:
       - 8.x
   tasks:
-    run_all:
-      name: "Build and test everything (Linux)"
-      build_targets:
-        - "//..."
+    test_docker:
+      name: "Test docker targets (Linux only)"
       test_targets:
         - "//..."
+      test_flags:
+        - "--test_tag_filters=docker"

.github/workflows/ci.yml

@@ -49,12 +49,14 @@ jobs:
           disk-cache: ${{ github.workflow }}-macos-${{ matrix.bazel }}
           repository-cache: ${{ github.workflow }}
 
-      - name: Build (excluding OCI targets)
-        run: bazel build //... --build_tag_filters=-oci
+      - name: Build
+        run: bazel build //...
         env:
           USE_BAZEL_VERSION: ${{ matrix.bazel }}
 
-      - name: Test (excluding OCI/docker tests)
-        run: bazel test //... --test_tag_filters=-docker,-oci
+      # Docker is not available on GitHub-hosted macOS runners
+      # https://github.com/actions/runner/issues/1456
+      - name: Test (excluding docker tests)
+        run: bazel test //... --test_tag_filters=-docker
         env:
           USE_BAZEL_VERSION: ${{ matrix.bazel }}

README.md

@@ -236,7 +236,6 @@ Arguments:
 - `env`: Dictionary of environment variant names to values, set in the Docker image when Grafana is run.  Optional.
     Useful for setting runtime configs with `GF_` variables.
 - `tags`: List of tags to apply to the target.  Optional.
-    Useful for filtering builds, e.g., `["oci"]` to exclude on macOS with `--build_tag_filters=-oci`.
 
 ### Module extension: `grafana`
 

grafana/extensions.bzl

@@ -29,8 +29,8 @@ def _grafana_extension_impl(module_ctx):
     """Implementation for grafana module extension."""
 
     # Pull default grafana container (linux/amd64 only).
-    # OCI image builds are skipped on macOS CI since rules_oci requires a matching
-    # host platform. For local macOS development, Docker Desktop emulates x86_64.
+    # OCI images can be built on any platform. Running containers requires Docker,
+    # which handles architecture translation on macOS via Docker Desktop.
     oci_pull(
         name = "grafana_oci",
         image = "index.docker.io/grafana/grafana",