wip

dfinity · Mar 4, 2025 · 8abc792 · 8abc792
1 parent f166377
commit 8abc792
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml
@@ -12,6 +12,9 @@ on:
   pull_request:
     paths:
       - ".github/workflows/system-tests-k8s.yml"
+  push:
+    branches:
+      - 'dev-gh-*'
   workflow_dispatch:
     inputs:
       targets:
@@ -83,6 +86,7 @@ jobs:
           BAZEL_COMMAND: >-
             test
               --config=ci
+              --strategy=Testing=local
               --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s,-manual,-colocated,-long_test,-system_test_hourly,-system_test_nightly --k8s
           BAZEL_TARGETS: ${{ env.TARGETS }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
@@ -155,6 +159,7 @@ jobs:
           BAZEL_COMMAND: >-
             test
               --config=ci
+              --strategy=Testing=local
               --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3
           BAZEL_TARGETS: ${{ env.TARGETS }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

diff --git a/rs/tests/system_tests.bzl b/rs/tests/system_tests.bzl
@@ -274,12 +274,6 @@ def system_test(
     if uses_boundary_guestos:
         icos_images["ENV_DEPS__BOUNDARY_GUESTOS_DISK_IMG"] = "//ic-os/boundary-guestos/envs/dev:disk-img.tar.zst"
 
-    # set "local" tag for k8s system tests due to rootful container image builds
-    is_k8s = select({
-        "//rs/tests:k8s": True,
-        "//conditions:default": False,
-    })
-
     run_system_test(
         name = name,
         src = test_driver_target,
@@ -288,7 +282,7 @@ def system_test(
         env = env,
         icos_images = icos_images,
         env_inherit = env_inherit,
-        tags = tags + ["requires-network", "system_test"] + (["local"] if is_k8s else []) +
+        tags = tags + ["requires-network", "system_test"] +
                (["manual"] if "experimental_system_test_colocation" in tags else []),
         target_compatible_with = ["@platforms//os:linux"],
         timeout = test_timeout,