diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index e398c13bc7b..b0cb9848c97 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -80,10 +80,12 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: + # set "local" tag for k8s system tests due to rootful container image builds BAZEL_COMMAND: >- test --config=ci - --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s,-manual,-colocated,-long_test,-system_test_hourly,-system_test_nightly --k8s + --config=k8s + --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s,-manual,-colocated,-long_test,-system_test_hourly,-system_test_nightly BAZEL_TARGETS: ${{ env.TARGETS }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -152,10 +154,12 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: + # set "local" tag for k8s system tests due to rootful container image builds BAZEL_COMMAND: >- test --config=ci - --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3 + --config=k8s + --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --flaky_test_attempts=3 BAZEL_TARGETS: ${{ env.TARGETS }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/bazel/conf/.bazelrc.build b/bazel/conf/.bazelrc.build index d487c0ff7cd..ffc882aa5f2 100644 --- a/bazel/conf/.bazelrc.build +++ b/bazel/conf/.bazelrc.build @@ -49,6 +49,9 @@ common --flag_alias=s3_upload=//ci/src/artifacts:s3_upload common --flag_alias=k8s=//rs/tests:k8s common --flag_alias=timeout_value=//bazel:timeout_value + +common:k8s --k8s --strategy_regexp='Testing.*'=local + common:stamped --workspace_status_command='$(pwd)/bazel/workspace_status.sh --stamp' common:release --config=stamped --s3_upload=True diff --git a/rs/tests/system_tests.bzl b/rs/tests/system_tests.bzl index c0849b6c932..f2dda37a512 100644 --- 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,8 +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 []) + - (["manual"] if "experimental_system_test_colocation" in tags 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, flaky = flaky,