From efc730166d3adc25d1ff84997c459f7d759ae436 Mon Sep 17 00:00:00 2001
From: Kanglan Tang <kanglan@google.com>
Date: Mon, 13 Mar 2023 17:50:27 -0700
Subject: [PATCH] Add `-oss_excluded` to TF build/test tag filters

Currently, `no_oss` is used to exclude a test from running in the official TF OSS test infrastructure. However, it is difficult to distinguish between temporary and permanent exclusions. For example, a test may be disabled temporarily if it is broken, or it may be designed to not run on OSS permanently. To address this issue, we introduce a new tag `oss_excluded` for platform exclusion design. `no_oss` will now be considered to disable broken tests, while `oss_excluded` will be used to permanently exclude a test from running on OSS.

PiperOrigin-RevId: 516372702
---
 configure.py                                         |  2 +-
 tensorflow/tools/ci_build/a100/nightly.sh            |  2 +-
 tensorflow/tools/ci_build/builds/docker_cpu_pip.sh   |  2 +-
 tensorflow/tools/ci_build/builds/pip_new.sh          |  1 +
 tensorflow/tools/ci_build/builds/run_pip_tests.sh    |  3 ++-
 tensorflow/tools/ci_build/linux/cpu/run_cc_core.sh   |  2 +-
 tensorflow/tools/ci_build/linux/cpu/run_mkl.sh       |  2 +-
 tensorflow/tools/ci_build/linux/cpu/run_py2_core.sh  |  2 +-
 .../tools/ci_build/linux/cpu/run_py3_contrib.sh      |  2 +-
 tensorflow/tools/ci_build/linux/cpu/run_py3_core.sh  |  2 +-
 tensorflow/tools/ci_build/linux/gpu/run_cc_core.sh   |  2 +-
 tensorflow/tools/ci_build/linux/gpu/run_mkl.sh       |  4 ++--
 tensorflow/tools/ci_build/linux/gpu/run_py3_core.sh  |  2 +-
 .../tools/ci_build/linux/ppc64le/cpu/run_py2.sh      |  2 +-
 .../tools/ci_build/linux/ppc64le/cpu/run_py3.sh      |  2 +-
 .../tools/ci_build/linux/ppc64le/gpu/run_py2.sh      |  2 +-
 .../tools/ci_build/linux/ppc64le/gpu/run_py3.sh      |  2 +-
 .../tools/ci_build/linux/rocm/rocm_py310_pip.sh      |  2 +-
 .../tools/ci_build/linux/rocm/rocm_py36_pip.sh       |  2 +-
 .../tools/ci_build/linux/rocm/rocm_py37_pip.sh       |  2 +-
 .../tools/ci_build/linux/rocm/rocm_py38_pip.sh       |  2 +-
 .../tools/ci_build/linux/rocm/rocm_py39_pip.sh       |  2 +-
 tensorflow/tools/ci_build/linux/rocm/run_cpu.sh      |  2 +-
 .../tools/ci_build/linux/rocm/run_gpu_single.sh      |  2 +-
 tensorflow/tools/ci_build/osx/cpu/run_contrib.sh     |  2 +-
 tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh |  2 +-
 tensorflow/tools/ci_build/osx/cpu/run_py3_cc_core.sh |  2 +-
 .../presubmit/ubuntu_16/cpu_py39_full/build.sh       |  2 +-
 .../presubmit/ubuntu_16/gpu_py39_full/build.sh       |  2 +-
 .../tools/ci_build/rel/macos/cpu_py310_nonpip.sh     |  2 +-
 .../tools/ci_build/rel/macos/cpu_py38_nonpip.sh      |  2 +-
 .../tools/ci_build/rel/macos/cpu_py39_nonpip.sh      |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh    |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh       |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_py310_nonpip.sh    |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_py310_pip.sh       |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_py38_nonpip.sh     |  2 +-
 tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_pip.sh |  2 +-
 .../tools/ci_build/rel/ubuntu/cpu_py39_nonpip.sh     |  2 +-
 tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_pip.sh |  2 +-
 .../tools/ci_build/rel/ubuntu/gpu_py310_nonpip.sh    |  2 +-
 .../tools/ci_build/rel/ubuntu/gpu_py310_pip.sh       |  2 +-
 .../tools/ci_build/rel/ubuntu/gpu_py38_nonpip.sh     |  2 +-
 tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_pip.sh |  2 +-
 .../tools/ci_build/rel/ubuntu/gpu_py39_nonpip.sh     |  2 +-
 tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_pip.sh |  2 +-
 tensorflow/tools/ci_build/release/mac_build_utils.sh |  2 +-
 .../release/ubuntu_16/tpu_py37_full/nonpip.sh        |  2 +-
 .../ci_build/windows/cpu/pip/build_tf_windows.sh     |  6 +++---
 .../ci_build/windows/gpu/pip/build_tf_windows.sh     |  4 ++--
 .../integration/gpu_pip_on_cpu/build_tf_windows.sh   |  4 ++--
 tensorflow/tools/ci_build/xla/linux/gpu/run_py3.sh   |  2 +-
 .../devel.usertools/cpu.bazelrc                      | 12 ++++++------
 .../devel.usertools/cpu_clang.bazelrc                | 12 ++++++------
 .../devel.usertools/gpu.bazelrc                      | 12 ++++++------
 .../devel.usertools/gpu_clang.bazelrc                | 12 ++++++------
 56 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/configure.py b/configure.py
index ac43369f4ef..73e124fb356 100644
--- a/configure.py
+++ b/configure.py
@@ -972,7 +972,7 @@ def system_specific_test_config(environ_cp):
   # single list of filters for the .bazelrc file.
 
   # Filters to use with both --test_tag_filters and --build_tag_filters
-  test_and_build_filters = ['-benchmark-test', '-no_oss']
+  test_and_build_filters = ['-benchmark-test', '-no_oss', '-oss_excluded']
   # Additional filters for --test_tag_filters beyond those in
   # test_and_build_filters
   test_only_filters = ['-oss_serial']
diff --git a/tensorflow/tools/ci_build/a100/nightly.sh b/tensorflow/tools/ci_build/a100/nightly.sh
index f5fc04a8e52..d2ca9a3ae86 100644
--- a/tensorflow/tools/ci_build/a100/nightly.sh
+++ b/tensorflow/tools/ci_build/a100/nightly.sh
@@ -18,4 +18,4 @@ set -e
 
 docker pull tensorflow/tensorflow:devel-gpu
 docker run --gpus all -w /tensorflow_src -v $PWD:/mnt -e HOST_PERMS="$(id -u):$(id -g)" \
-    tensorflow/tensorflow:devel-gpu bash -c "git pull; bazel test --config=cuda -c opt --test_tag_filters=gpu,-no_gpu,-benchmark-test,-no_oss,-oss_serial,-v1only,-no_gpu_presubmit,-no_cuda11 -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/mlir/tosa/... -//tensorflow/compiler/xrt/... //tensorflow/compiler/mlir/lite/... -//tensorflow/lite/micro/examples/... -//tensorflow/core/tpu/... -//tensorflow/lite/..."
+    tensorflow/tensorflow:devel-gpu bash -c "git pull; bazel test --config=cuda -c opt --test_tag_filters=gpu,-no_gpu,-benchmark-test,-no_oss,-oss_excluded,-oss_serial,-v1only,-no_gpu_presubmit,-no_cuda11 -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/mlir/tosa/... -//tensorflow/compiler/xrt/... //tensorflow/compiler/mlir/lite/... -//tensorflow/lite/micro/examples/... -//tensorflow/core/tpu/... -//tensorflow/lite/..."
diff --git a/tensorflow/tools/ci_build/builds/docker_cpu_pip.sh b/tensorflow/tools/ci_build/builds/docker_cpu_pip.sh
index cf7a2e0e949..41f411ae499 100755
--- a/tensorflow/tools/ci_build/builds/docker_cpu_pip.sh
+++ b/tensorflow/tools/ci_build/builds/docker_cpu_pip.sh
@@ -44,7 +44,7 @@ bazel --output_base=/tmp test --define=no_tensorflow_py_deps=true \
       --test_lang_filters=py \
       --build_tests_only \
       -k \
-      --test_tag_filters=-no_oss,-oss_serial,-no_pip,-nopip,-gpu,-tpu \
+      --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-no_pip,-nopip,-gpu,-tpu \
       --test_size_filters=small,medium \
       --test_timeout 300,450,1200,3600 \
       --test_output=errors \
diff --git a/tensorflow/tools/ci_build/builds/pip_new.sh b/tensorflow/tools/ci_build/builds/pip_new.sh
index 9cffed974c6..e405ce7c736 100755
--- a/tensorflow/tools/ci_build/builds/pip_new.sh
+++ b/tensorflow/tools/ci_build/builds/pip_new.sh
@@ -530,6 +530,7 @@ run_test_with_bazel() {
 
   if [[ "${IS_OSS_SERIAL}" == "1" ]]; then
     remove_test_filter_tag -no_oss
+    remove_test_filter_tag -oss_excluded
     remove_test_filter_tag -oss_serial
     add_test_filter_tag oss_serial
   else
diff --git a/tensorflow/tools/ci_build/builds/run_pip_tests.sh b/tensorflow/tools/ci_build/builds/run_pip_tests.sh
index f22d5d74d2d..6cea2467142 100755
--- a/tensorflow/tools/ci_build/builds/run_pip_tests.sh
+++ b/tensorflow/tools/ci_build/builds/run_pip_tests.sh
@@ -84,9 +84,10 @@ ln -s $(pwd)/tensorflow ${PIP_TEST_ROOT}/tensorflow
 
 # Do not run tests with "no_pip" tag. If running GPU tests, also do not run
 # tests with no_pip_gpu tag.
-PIP_TEST_FILTER_TAG="-no_pip,-no_oss,-benchmark-test"
+PIP_TEST_FILTER_TAG="-no_pip,-no_oss,-oss_excluded,-benchmark-test"
 if [[ ${IS_OSS_SERIAL} == "1" ]]; then
   PIP_TEST_FILTER_TAG="$(echo "${PIP_TEST_FILTER_TAG}" | sed s/-no_oss//)"
+   PIP_TEST_FILTER_TAG="$(echo "${PIP_TEST_FILTER_TAG}" | sed s/-oss_excluded//)"
   PIP_TEST_FILTER_TAG="${PIP_TEST_FILTER_TAG},oss_serial"
 else
   PIP_TEST_FILTER_TAG="${PIP_TEST_FILTER_TAG},-oss_serial"
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_cc_core.sh b/tensorflow/tools/ci_build/linux/cpu/run_cc_core.sh
index 05e6c77f005..9036509e689 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_cc_core.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_cc_core.sh
@@ -33,7 +33,7 @@ export PYTHON_BIN_PATH=`which python`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-gpu,-tpu,-benchmark-test --test_lang_filters=cc,java -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test --test_lang_filters=cc,java -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
     //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_mkl.sh b/tensorflow/tools/ci_build/linux/cpu/run_mkl.sh
index 534189d3238..44866bab01a 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_mkl.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_mkl.sh
@@ -89,7 +89,7 @@ echo ""
 # execution in an MKL primitive. This reduces the effects of an oversubscription
 # of OpenMP threads caused by executing multiple tests concurrently.
 bazel test \
-    --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only \
+    --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only \
     --test_lang_filters=cc,py \
     -k \
     --jobs=${N_JOBS} \
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py2_core.sh b/tensorflow/tools/ci_build/linux/cpu/run_py2_core.sh
index ae7e6d49c50..c8502b62b03 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py2_core.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py2_core.sh
@@ -32,7 +32,7 @@ export PYTHON_BIN_PATH=`which python2`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-no_oss_py2,-oss_serial,-gpu,-tpu,-benchmark-test --test_lang_filters=py -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-no_oss_py2,-oss_serial,-gpu,-tpu,-benchmark-test --test_lang_filters=py -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
     //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
index 5097196d3c1..d6af6490758 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
@@ -32,7 +32,7 @@ export PYTHON_BIN_PATH=`which python3`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --config=opt \
     --test_size_filters=small,medium --test_output=errors -- \
     //tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py3_core.sh b/tensorflow/tools/ci_build/linux/cpu/run_py3_core.sh
index 0a866e69f50..015b0f47678 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py3_core.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py3_core.sh
@@ -32,7 +32,7 @@ export PYTHON_BIN_PATH=`which python3`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test --test_lang_filters=py -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test --test_lang_filters=py -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
     //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/gpu/run_cc_core.sh b/tensorflow/tools/ci_build/linux/gpu/run_cc_core.sh
index af3bf0d3295..d58d12fb34e 100755
--- a/tensorflow/tools/ci_build/linux/gpu/run_cc_core.sh
+++ b/tensorflow/tools/ci_build/linux/gpu/run_cc_core.sh
@@ -35,7 +35,7 @@ export TF_CUDA_COMPUTE_CAPABILITIES=3.7
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
+bazel test --config=cuda --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-no_gpu,-benchmark-test -k \
     --test_lang_filters=cc --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --build_tests_only --test_output=errors --local_test_jobs=8 --config=opt \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/linux/gpu/run_mkl.sh b/tensorflow/tools/ci_build/linux/gpu/run_mkl.sh
index d8e4c6f78fb..dce347ec3d4 100755
--- a/tensorflow/tools/ci_build/linux/gpu/run_mkl.sh
+++ b/tensorflow/tools/ci_build/linux/gpu/run_mkl.sh
@@ -74,8 +74,8 @@ echo ""
 #Bazel test command with two option eigencuda or dnllcuda
 
 bazel test \
-    --test_tag_filters=gpu,-no_gpu,-benchmark-test,-no_gpu_presubmit,-no_cuda11,-v1only,-no_oss,-oss_serial \
-    --build_tag_filters=gpu,-no_gpu,-benchark-test,-no_oss,-oss_serial,-no_gpu_presubmit,-no_cuda11,-v1only \
+    --test_tag_filters=gpu,-no_gpu,-benchmark-test,-no_gpu_presubmit,-no_cuda11,-v1only,-no_oss,-oss_excluded,-oss_serial \
+    --build_tag_filters=gpu,-no_gpu,-benchark-test,-no_oss,-oss_excluded,-oss_serial,-no_gpu_presubmit,-no_cuda11,-v1only \
     --test_lang_filters=cc,py \
     -c opt -k \
     --test_timeout 300,450,1200,3600 \
diff --git a/tensorflow/tools/ci_build/linux/gpu/run_py3_core.sh b/tensorflow/tools/ci_build/linux/gpu/run_py3_core.sh
index b0f47b1b5cd..5b829d9fe08 100755
--- a/tensorflow/tools/ci_build/linux/gpu/run_py3_core.sh
+++ b/tensorflow/tools/ci_build/linux/gpu/run_py3_core.sh
@@ -35,7 +35,7 @@ export TF_CUDA_COMPUTE_CAPABILITIES=3.7
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
+bazel test --config=cuda --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-no_gpu,-benchmark-test -k \
     --test_lang_filters=py --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --build_tests_only --test_output=errors --local_test_jobs=8 --config=opt \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh
index 94d88b27e85..17c5fd97b5f 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh
@@ -31,7 +31,7 @@ export PYTHON_BIN_PATH=`which python2`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
     //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh
index 1e9c639f0bb..7a2443c61d9 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh
@@ -31,7 +31,7 @@ export PYTHON_BIN_PATH=`which python3`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test -k \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
     //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh
index 77286e8448a..4c0eb4b9e03 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh
@@ -36,7 +36,7 @@ export TF_CUDA_COMPUTE_CAPABILITIES=3.7
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
+bazel test --config=cuda --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-no_gpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_output=errors --local_test_jobs=${LT_JOBS} --build_tests_only --config=opt \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh
index 17aa52ee6b0..aa140c100d6 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh
@@ -36,7 +36,7 @@ export TF_CUDA_COMPUTE_CAPABILITIES=3.7
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
+bazel test --config=cuda --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-no_gpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_output=errors --local_test_jobs=${LT_JOBS} --build_tests_only --config=opt \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/linux/rocm/rocm_py310_pip.sh b/tensorflow/tools/ci_build/linux/rocm/rocm_py310_pip.sh
index 6c85e24fcbb..cc4f8c8480c 100755
--- a/tensorflow/tools/ci_build/linux/rocm/rocm_py310_pip.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/rocm_py310_pip.sh
@@ -55,7 +55,7 @@ else
 fi
 
 # # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_rocm${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}'
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_rocm${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}'
 export TF_BUILD_FLAGS="--config=release_base "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
  --test_env=TF2_BEHAVIOR=1 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/rocm_py36_pip.sh b/tensorflow/tools/ci_build/linux/rocm/rocm_py36_pip.sh
index ee4960e111e..a3745cb9640 100755
--- a/tensorflow/tools/ci_build/linux/rocm/rocm_py36_pip.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/rocm_py36_pip.sh
@@ -43,7 +43,7 @@ export N_TEST_JOBS=$(expr ${TF_GPU_COUNT} \* ${TF_TESTS_PER_GPU})
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
 # # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py36,-no_rocm'
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py36,-no_rocm'
 export TF_BUILD_FLAGS="--config=release_base "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
  --test_env=TF2_BEHAVIOR=1 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/rocm_py37_pip.sh b/tensorflow/tools/ci_build/linux/rocm/rocm_py37_pip.sh
index 8544376dc7b..68829777813 100755
--- a/tensorflow/tools/ci_build/linux/rocm/rocm_py37_pip.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/rocm_py37_pip.sh
@@ -57,7 +57,7 @@ fi
 
 
 # # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
 export TF_BUILD_FLAGS="--config=release_base "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
  --test_env=TF2_BEHAVIOR=1 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/rocm_py38_pip.sh b/tensorflow/tools/ci_build/linux/rocm/rocm_py38_pip.sh
index 22252ccf9ef..6395660b52b 100755
--- a/tensorflow/tools/ci_build/linux/rocm/rocm_py38_pip.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/rocm_py38_pip.sh
@@ -57,7 +57,7 @@ fi
 
 
 # # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
 export TF_BUILD_FLAGS="--config=release_base "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
  --test_env=TF2_BEHAVIOR=1 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/rocm_py39_pip.sh b/tensorflow/tools/ci_build/linux/rocm/rocm_py39_pip.sh
index b3bad8287f1..043791c794f 100755
--- a/tensorflow/tools/ci_build/linux/rocm/rocm_py39_pip.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/rocm_py39_pip.sh
@@ -55,7 +55,7 @@ else
 fi
 
 # # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_rocm'${TF_TEST_FILTER_TAGS_ROCM_VERSION_SPECIFIC}
 export TF_BUILD_FLAGS="--config=release_base "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
  --test_env=TF2_BEHAVIOR=1 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/run_cpu.sh b/tensorflow/tools/ci_build/linux/rocm/run_cpu.sh
index 36abc8d2786..8e0df6fe289 100755
--- a/tensorflow/tools/ci_build/linux/rocm/run_cpu.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/run_cpu.sh
@@ -33,7 +33,7 @@ yes "" | $PYTHON_BIN_PATH configure.py
 # Run bazel test command. Double test timeouts to avoid flakes.
 bazel test \
       -k \
-      --test_tag_filters=-no_oss,-oss_serial,-gpu,-multi_gpu,-tpu,-no_rocm,-benchmark-test,-v1only \
+      --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-multi_gpu,-tpu,-no_rocm,-benchmark-test,-v1only \
       --jobs=${N_BUILD_JOBS} \
       --local_test_jobs=${N_BUILD_JOBS} \
       --test_timeout 600,900,2400,7200 \
diff --git a/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh b/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh
index 2a94e561556..6d68d8ae10f 100755
--- a/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh
+++ b/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh
@@ -44,7 +44,7 @@ yes "" | $PYTHON_BIN_PATH configure.py
 bazel test \
       --config=rocm \
       -k \
-      --test_tag_filters=gpu,-no_oss,-oss_serial,-no_gpu,-no_rocm,-benchmark-test,-rocm_multi_gpu,-tpu,-v1only \
+      --test_tag_filters=gpu,-no_oss,-oss_excluded,-oss_serial,-no_gpu,-no_rocm,-benchmark-test,-rocm_multi_gpu,-tpu,-v1only \
       --jobs=${N_BUILD_JOBS} \
       --local_test_jobs=${N_TEST_JOBS} \
       --test_env=TF_GPU_COUNT=$TF_GPU_COUNT \
diff --git a/tensorflow/tools/ci_build/osx/cpu/run_contrib.sh b/tensorflow/tools/ci_build/osx/cpu/run_contrib.sh
index f79e4b2a9f3..02ba207ea7a 100755
--- a/tensorflow/tools/ci_build/osx/cpu/run_contrib.sh
+++ b/tensorflow/tools/ci_build/osx/cpu/run_contrib.sh
@@ -32,7 +32,7 @@ export PYTHON_BIN_PATH=$(which python2)
 yes "" | $PYTHON_BIN_PATH configure.py
 which bazel
 # TODO(b/122370901): Fix nomac, no_mac inconsistency.
-bazel test --test_tag_filters=-no_oss,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
     --test_timeout 300,450,1200,3600 \
     --test_size_filters=small,medium --config=opt \
     --jobs=${N_JOBS} --build_tests_only --test_output=errors -k -- \
diff --git a/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
index f5ca260c75d..46f63544a07 100755
--- a/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
+++ b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
@@ -33,7 +33,7 @@ export PYTHON_BIN_PATH=$(which python2)
 yes "" | $PYTHON_BIN_PATH configure.py
 which bazel
 # TODO(b/122370901): Fix nomac, no_mac inconsistency.
-bazel test --test_tag_filters=-no_oss,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
     --test_timeout 300,450,1200,3600 --config=opt \
     --announce_rc \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/osx/cpu/run_py3_cc_core.sh b/tensorflow/tools/ci_build/osx/cpu/run_py3_cc_core.sh
index 3770f048ede..30d0873be76 100755
--- a/tensorflow/tools/ci_build/osx/cpu/run_py3_cc_core.sh
+++ b/tensorflow/tools/ci_build/osx/cpu/run_py3_cc_core.sh
@@ -30,7 +30,7 @@ export TF_NEED_CUDA=0
 export PYTHON_BIN_PATH=$(which python3)
 yes "" | $PYTHON_BIN_PATH configure.py
 which bazel
-bazel test --test_tag_filters=-no_oss,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
+bazel test --test_tag_filters=-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test,-nomac,-no_mac,-mac_excluded \
     --announce_rc \
     --test_timeout 300,450,1200,3600 \
     --test_size_filters=small,medium \
diff --git a/tensorflow/tools/ci_build/presubmit/ubuntu_16/cpu_py39_full/build.sh b/tensorflow/tools/ci_build/presubmit/ubuntu_16/cpu_py39_full/build.sh
index 3af709beda5..0fef37f245d 100644
--- a/tensorflow/tools/ci_build/presubmit/ubuntu_16/cpu_py39_full/build.sh
+++ b/tensorflow/tools/ci_build/presubmit/ubuntu_16/cpu_py39_full/build.sh
@@ -31,7 +31,7 @@ which bazel
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
-tag_filters="-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test""$(maybe_skip_v1)"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test""$(maybe_skip_v1)"
 
 # Run bazel test command.
 "${BAZEL_WRAPPER_PATH}" \
diff --git a/tensorflow/tools/ci_build/presubmit/ubuntu_16/gpu_py39_full/build.sh b/tensorflow/tools/ci_build/presubmit/ubuntu_16/gpu_py39_full/build.sh
index 323aaadd04b..6c7ba0dc8b5 100644
--- a/tensorflow/tools/ci_build/presubmit/ubuntu_16/gpu_py39_full/build.sh
+++ b/tensorflow/tools/ci_build/presubmit/ubuntu_16/gpu_py39_full/build.sh
@@ -28,7 +28,7 @@ source tensorflow/tools/ci_build/release/common.sh
 install_bazelisk
 which bazel
 
-tag_filters="gpu,-no_gpu,-benchmark-test,-no_oss,-oss_serial,-no_gpu_presubmit,-no_cuda11""$(maybe_skip_v1)"
+tag_filters="gpu,-no_gpu,-benchmark-test,-no_oss,-oss_excluded,-oss_serial,-no_gpu_presubmit,-no_cuda11""$(maybe_skip_v1)"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/macos/cpu_py310_nonpip.sh b/tensorflow/tools/ci_build/rel/macos/cpu_py310_nonpip.sh
index 59b1dc594d2..dba41dc5108 100644
--- a/tensorflow/tools/ci_build/rel/macos/cpu_py310_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/macos/cpu_py310_nonpip.sh
@@ -31,7 +31,7 @@ python -m venv .tf-venv && source .tf-venv/bin/activate
 # Set up and install MacOS pip dependencies.
 install_macos_pip_deps
 
-tag_filters="-no_oss,-oss_serial,-no_oss_py310,-mac_excluded,-nomac,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-no_oss_py310,-mac_excluded,-nomac,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/macos/cpu_py38_nonpip.sh b/tensorflow/tools/ci_build/rel/macos/cpu_py38_nonpip.sh
index 5c9ff15a31b..ab17dd09c56 100644
--- a/tensorflow/tools/ci_build/rel/macos/cpu_py38_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/macos/cpu_py38_nonpip.sh
@@ -31,7 +31,7 @@ python -m venv .tf-venv && source .tf-venv/bin/activate
 # Set up and install MacOS pip dependencies.
 install_macos_pip_deps
 
-tag_filters="-no_oss,-oss_serial,-mac_excluded,-nomac,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-nomac,-mac_excluded,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/macos/cpu_py39_nonpip.sh b/tensorflow/tools/ci_build/rel/macos/cpu_py39_nonpip.sh
index a7dbb63cbed..bac3b85b0ae 100644
--- a/tensorflow/tools/ci_build/rel/macos/cpu_py39_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/macos/cpu_py39_nonpip.sh
@@ -31,7 +31,7 @@ python -m venv .tf-venv && source .tf-venv/bin/activate
 # Set up and install MacOS pip dependencies.
 install_macos_pip_deps
 
-tag_filters="-no_oss,-oss_serial,-mac_excluded,-nomac,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-nomac,-mac_excluded,-no_mac$(maybe_skip_v1),-gpu,-tpu,-benchmark-test"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh
index 8cec9e13cb0..33714cf8216 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh
@@ -68,7 +68,7 @@ export TF_TEST_FLAGS="${TF_BUILD_FLAGS} --test_env=TF_ENABLE_ONEDNN_OPTS=1 \
     --test_env=TF2_BEHAVIOR=1 --define=tf_api_version=2 --distinct_host_configuration=false \
     --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium"
 export TF_TEST_TARGETS="${DEFAULT_BAZEL_TARGETS} ${ARM_SKIP_TESTS}"
-export TF_FILTER_TAGS="-no_oss,-oss_serial,-v1only,-benchmark-test,-no_aarch64,-gpu,-tpu,-requires-gpu"
+export TF_FILTER_TAGS="-no_oss,-oss_excluded,-oss_serial,-v1only,-benchmark-test,-no_aarch64,-gpu,-tpu,-requires-gpu"
 
 bazel test ${TF_TEST_FLAGS} \
     --repo_env=PYTHON_BIN_PATH="$(which python)" \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh
index 3e655500363..190ded0db03 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh
@@ -77,7 +77,7 @@ export TF_TEST_FLAGS="${TF_BUILD_FLAGS} \
     --test_output=errors --verbose_failures=true --test_keep_going"
 export TF_TEST_TARGETS="${DEFAULT_BAZEL_TARGETS} ${ARM_SKIP_TESTS}"
 export TF_PIP_TESTS="test_pip_virtualenv_clean test_pip_virtualenv_oss_serial"
-export TF_TEST_FILTER_TAGS="-no_oss,-v1only,-benchmark-test,-no_aarch64,-no_oss_py38,-no_oss_py39,-no_oss_py310"
+export TF_TEST_FILTER_TAGS="-no_oss,-oss_excluded,-v1only,-benchmark-test,-no_aarch64,-no_oss_py38,-no_oss_py39,-no_oss_py310"
 export TF_PIP_TEST_ROOT="pip_test"
 export TF_AUDITWHEEL_TARGET_PLAT="manylinux2014"
 
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_nonpip.sh
index 899594578e3..1024fe7cba2 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_nonpip.sh
@@ -24,7 +24,7 @@ install_bazelisk
 # Setup virtual environment and install dependencies
 setup_venv_ubuntu python3.10
 
-tag_filters="-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py310,-v1only"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py310,-v1only"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_pip.sh
index 2133a872a2e..6e819a7e901 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py310_pip.sh
@@ -38,7 +38,7 @@ export TF_BUILD_FLAGS="--config=release_cpu_linux"
 export TF_TEST_FLAGS="--define=no_tensorflow_py_deps=true --test_lang_filters=py --test_output=errors --verbose_failures=true --keep_going --test_env=TF2_BEHAVIOR=1"
 export TF_TEST_TARGETS="${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... "
 export TF_PIP_TESTS="test_pip_virtualenv_non_clean test_pip_virtualenv_clean"
-export TF_TEST_FILTER_TAGS='-no_oss,-oss_serial,-no_oss_py310,-v1only'
+export TF_TEST_FILTER_TAGS='-no_oss,-oss_excluded,-oss_serial,-no_oss_py310,-v1only'
 #export IS_NIGHTLY=0 # Not nightly; uncomment if building from tf repo.
 export TF_PROJECT_NAME="tensorflow_cpu"
 export TF_PIP_TEST_ROOT="pip_test"
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_nonpip.sh
index 8379b5c240d..d2cd0509f64 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_nonpip.sh
@@ -24,7 +24,7 @@ install_bazelisk
 # Setup virtual environment and install dependencies
 setup_venv_ubuntu python3.8
 
-tag_filters="-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py38,-v1only"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py38,-v1only"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_pip.sh
index 2de86ec21cf..2c2b6b51431 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py38_pip.sh
@@ -35,7 +35,7 @@ export TF_BUILD_FLAGS="--config=release_cpu_linux"
 export TF_TEST_FLAGS="--define=no_tensorflow_py_deps=true --test_lang_filters=py --test_output=errors --verbose_failures=true --keep_going --test_env=TF2_BEHAVIOR=1"
 export TF_TEST_TARGETS="${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... "
 export TF_PIP_TESTS="test_pip_virtualenv_non_clean test_pip_virtualenv_clean"
-export TF_TEST_FILTER_TAGS='-no_oss,-oss_serial,-no_oss_py38,-v1only'
+export TF_TEST_FILTER_TAGS='-no_oss,-oss_excluded,-oss_serial,-no_oss_py38,-v1only'
 #export IS_NIGHTLY=0 # Not nightly; uncomment if building from tf repo.
 export TF_PROJECT_NAME="tensorflow_cpu"
 export TF_PIP_TEST_ROOT="pip_test"
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_nonpip.sh
index 18751b21d93..09a227096bd 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_nonpip.sh
@@ -24,7 +24,7 @@ install_bazelisk
 # Setup virtual environment and install dependencies
 setup_venv_ubuntu python3.9
 
-tag_filters="-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py39,-v1only"
+tag_filters="-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-no_oss_py39,-v1only"
 
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_pip.sh
index 579951dea33..8dd90185dcc 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/cpu_py39_pip.sh
@@ -35,7 +35,7 @@ export TF_BUILD_FLAGS="--config=release_cpu_linux"
 export TF_TEST_FLAGS="--define=no_tensorflow_py_deps=true --test_lang_filters=py --test_output=errors --verbose_failures=true --keep_going --test_env=TF2_BEHAVIOR=1"
 export TF_TEST_TARGETS="${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... "
 export TF_PIP_TESTS="test_pip_virtualenv_non_clean test_pip_virtualenv_clean"
-export TF_TEST_FILTER_TAGS='-no_oss,-oss_serial,-no_oss_py39,-v1only'
+export TF_TEST_FILTER_TAGS='-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-v1only'
 #export IS_NIGHTLY=0 # Not nightly; uncomment if building from tf repo.
 export TF_PROJECT_NAME="tensorflow_cpu"
 export TF_PIP_TEST_ROOT="pip_test"
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_nonpip.sh
index 76a163237ba..04d955d2883 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_nonpip.sh
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH="/usr/local/cuda:/usr/local/cuda/lib64:/usr/local/cuda/ex
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
-tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py310,-no_cuda11"
+tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py310,-no_cuda11"
 
 test +e
 bazel test \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_pip.sh
index bb029f42ea1..21de1c99e7a 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py310_pip.sh
@@ -33,7 +33,7 @@ export PYTHON_BIN_PATH="$(which ${TF_PYTHON_VERSION})"
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
 # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py310,-no_cuda11'
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py310,-no_cuda11'
 export TF_BUILD_FLAGS="--config=release_gpu_linux "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
 --distinct_host_configuration=false \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_nonpip.sh
index d4350826d30..ded33505b87 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_nonpip.sh
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH="/usr/local/cuda:/usr/local/cuda/lib64:/usr/local/cuda/ex
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
-tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py38,-no_cuda11"
+tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py38,-no_cuda11"
 
 test +e
 bazel test \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_pip.sh
index 4403e0ecaf1..3ad048d86c3 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py38_pip.sh
@@ -30,7 +30,7 @@ export PYTHON_BIN_PATH="$(which ${TF_PYTHON_VERSION})"
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
 # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py38,-no_cuda11'
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py38,-no_cuda11'
 export TF_BUILD_FLAGS="--config=release_gpu_linux "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
 --distinct_host_configuration=false \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_nonpip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_nonpip.sh
index 1d292039b3c..ba3748b5698 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_nonpip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_nonpip.sh
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH="/usr/local/cuda:/usr/local/cuda/lib64:/usr/local/cuda/ex
 # Get the default test targets for bazel.
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
-tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_cuda11"
+tag_filters="gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_cuda11"
 
 test +e
 bazel test \
diff --git a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_pip.sh b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_pip.sh
index 15d5dc6f47a..e26f4461e33 100644
--- a/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_pip.sh
+++ b/tensorflow/tools/ci_build/rel/ubuntu/gpu_py39_pip.sh
@@ -30,7 +30,7 @@ export PYTHON_BIN_PATH="$(which ${TF_PYTHON_VERSION})"
 source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
 
 # Export optional variables for running pip.sh
-export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_oss_py39,-no_cuda11'
+export TF_TEST_FILTER_TAGS='gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_oss_py39,-no_cuda11'
 export TF_BUILD_FLAGS="--config=release_gpu_linux "
 export TF_TEST_FLAGS="--test_tag_filters=${TF_TEST_FILTER_TAGS} --build_tag_filters=${TF_TEST_FILTER_TAGS} \
 --distinct_host_configuration=false \
diff --git a/tensorflow/tools/ci_build/release/mac_build_utils.sh b/tensorflow/tools/ci_build/release/mac_build_utils.sh
index 189a087305e..8f8dfd30433 100644
--- a/tensorflow/tools/ci_build/release/mac_build_utils.sh
+++ b/tensorflow/tools/ci_build/release/mac_build_utils.sh
@@ -129,7 +129,7 @@ function bazel_test_wheel {
   # Run Bazel Test
   PY_MAJ_MINOR_VER=$(python -c "print(__import__('sys').version)" 2>&1 | awk '{ print $1 }' | head -n 1 | awk -F'.'  '{printf "%s%s\n", $1, $2 }')
   TF_TEST_FLAGS="--define=no_tensorflow_py_deps=true --test_lang_filters=py --test_output=errors --verbose_failures=true --keep_going --test_env=TF2_BEHAVIOR=1"
-  TF_TEST_FILTER_TAGS="-nopip,-no_pip,-nomac,-no_mac,-mac_excluded,-no_oss,-oss_serial,-no_oss_py${PY_MAJ_MINOR_VER},-v1only,-gpu,-tpu,-benchmark-test"
+  TF_TEST_FILTER_TAGS="-nopip,-no_pip,-nomac,-no_mac,-mac_excluded,-no_oss,-oss_excluded,-oss_serial,-no_oss_py${PY_MAJ_MINOR_VER},-v1only,-gpu,-tpu,-benchmark-test"
   BAZEL_PARALLEL_TEST_FLAGS="--local_test_jobs=$(sysctl -n hw.ncpu)"
 
   # Install additional test requirements
diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/tpu_py37_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/tpu_py37_full/nonpip.sh
index 1b17b3be252..ee6982efad0 100644
--- a/tensorflow/tools/ci_build/release/ubuntu_16/tpu_py37_full/nonpip.sh
+++ b/tensorflow/tools/ci_build/release/ubuntu_16/tpu_py37_full/nonpip.sh
@@ -23,7 +23,7 @@ pip3.9 install --user --upgrade --ignore-installed cloud-tpu-client
 install_bazelisk
 
 test_patterns=(//tensorflow/... -//tensorflow/compiler/... -//tensorflow/lite/...)
-tag_filters="tpu,-tpu_pod,-no_tpu,-notpu,-no_oss,-no_oss_py37"
+tag_filters="tpu,-tpu_pod,-no_tpu,-notpu,-no_oss,-oss_excluded,-no_oss_py37"
 
 bazel_args=(
   --config=release_cpu_linux \
diff --git a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
index c559cccdfb3..0042a8369d9 100644
--- a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
+++ b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
@@ -138,7 +138,7 @@ run_configure_for_cpu_build
 
 bazel build ${EXTRA_BUILD_FLAGS}  \
   --experimental_cc_shared_library \
-  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-gpu,-tpu \
+  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu \
   --output_filter=^$ \
   tensorflow/lite:framework tensorflow/lite/examples/minimal:minimal || exit $?
 
@@ -174,8 +174,8 @@ bazel test --announce_rc --config=opt -k --test_output=errors \
   --experimental_cc_shared_library \
   ${EXTRA_TEST_FLAGS} \
   --define=no_tensorflow_py_deps=true --test_lang_filters=py \
-  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-gpu,-tpu,-v1only \
-  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-gpu,-tpu --build_tests_only \
+  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu,-v1only \
+  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu --build_tests_only \
   --test_size_filters=small,medium \
   --jobs="${N_JOBS}" --test_timeout="300,450,1200,3600" \
   --flaky_test_attempts=3 \
diff --git a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
index 58bea5173de..612d681fa10 100644
--- a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
+++ b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
@@ -174,8 +174,8 @@ bazel test \
   ${EXTRA_TEST_FLAGS} \
   --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \
   --define=no_tensorflow_py_deps=true --test_lang_filters=py \
-  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,gpu,-v1only \
-  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,gpu --build_tests_only \
+  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,-oss_excluded,gpu,-v1only \
+  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,-oss_excluded,gpu --build_tests_only \
   --test_size_filters=small,medium \
   --local_test_jobs=$TF_GPU_COUNT --test_timeout="300,450,1200,3600" \
   --flaky_test_attempts=3 \
diff --git a/tensorflow/tools/ci_build/windows/integration/gpu_pip_on_cpu/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/integration/gpu_pip_on_cpu/build_tf_windows.sh
index 13bc7ea5003..d672d7dc475 100644
--- a/tensorflow/tools/ci_build/windows/integration/gpu_pip_on_cpu/build_tf_windows.sh
+++ b/tensorflow/tools/ci_build/windows/integration/gpu_pip_on_cpu/build_tf_windows.sh
@@ -191,8 +191,8 @@ N_JOBS="${NUMBER_OF_PROCESSORS}"
 bazel test --announce_rc --config=opt -k --test_output=errors \
   ${EXTRA_TEST_FLAGS} \
   --define=no_tensorflow_py_deps=true --test_lang_filters=py \
-  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-gpu,-tpu \
-  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-gpu,-tpu --build_tests_only \
+  --test_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu \
+  --build_tag_filters=-no_pip,-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu --build_tests_only \
   --test_size_filters=small,medium \
   --jobs="${N_JOBS}" --test_timeout="300,450,1200,3600" \
   --flaky_test_attempts=3 \
diff --git a/tensorflow/tools/ci_build/xla/linux/gpu/run_py3.sh b/tensorflow/tools/ci_build/xla/linux/gpu/run_py3.sh
index d085e21b030..010d314b9a1 100755
--- a/tensorflow/tools/ci_build/xla/linux/gpu/run_py3.sh
+++ b/tensorflow/tools/ci_build/xla/linux/gpu/run_py3.sh
@@ -35,7 +35,7 @@ echo "build --distinct_host_configuration=false" >> .tf_configure.bazelrc
 
 bazel clean
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_gpu,-benchmark-test,-no_oss -k \
+bazel test --config=cuda --test_tag_filters=-no_gpu,-benchmark-test,-no_oss,-oss_excluded -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_size_filters=small,medium \
     --build_tests_only --test_output=errors --local_test_jobs=8 \
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu.bazelrc b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu.bazelrc
index 5735efe8a88..23ddf7c6a61 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu.bazelrc
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu.bazelrc
@@ -50,8 +50,8 @@ test --test_summary=short
 # Pass --config=nonpip to run the same suite of tests. If you want to run just
 # one test for investigation, you don't need --config=nonpip; just run the
 # bazel test invocation as normal.
-test:nonpip_filters --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
-test:nonpip_filters --build_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:nonpip_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:nonpip_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
 test:nonpip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:nonpip --config=nonpip_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -74,8 +74,8 @@ test:pip_venv --python_path="/bazel_pip/bin/python3"
 test:pip_venv --define=no_tensorflow_py_deps=true
 test:pip --config=pip_venv
 # Yes, we don't exclude the gpu tests on pip for some reason.
-test:pip_filters --test_tag_filters=-nopip,-no_pip,-no_oss,-oss_serial,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
-test:pip_filters --build_tag_filters=-nopip,-no_pip,-no_oss,-oss_serial,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:pip_filters --test_tag_filters=-nopip,-no_pip,-no_oss,-oss_excluded,-oss_serial,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:pip_filters --build_tag_filters=-nopip,-no_pip,-no_oss,-oss_excluded,-oss_serial,-v1only,-no_oss_py38,-no_oss_py39,-no_oss_py310
 test:pip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pip --config=pip_filters -- //bazel_pip/tensorflow/... -//bazel_pip/tensorflow/python/integration_testing/... -//bazel_pip/tensorflow/compiler/tf2tensorrt/... -//bazel_pip/tensorflow/compiler/xrt/... -//bazel_pip/tensorflow/core/tpu/... -//bazel_pip/tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -110,7 +110,7 @@ build:rbe --remote_instance_name=projects/tensorflow-testing/instances/default_i
 build:rbe --project_id="tensorflow-testing"
 
 # For continuous builds
-test:pycpp_filters --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
-test:pycpp_filters --build_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:pycpp_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:pycpp_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
 test:pycpp_filters --test_lang_filters=cc,py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pycpp --config=pycpp_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu_clang.bazelrc b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu_clang.bazelrc
index e50e7779f64..8852b24b4f1 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu_clang.bazelrc
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu_clang.bazelrc
@@ -57,8 +57,8 @@ test --test_summary=short
 # Pass --config=nonpip to run the same suite of tests. If you want to run just
 # one test for investigation, you don't need --config=nonpip; just run the
 # bazel test invocation as normal.
-test:nonpip_filters --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
-test:nonpip_filters --build_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:nonpip_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:nonpip_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
 test:nonpip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:nonpip --config=nonpip_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -81,8 +81,8 @@ test:pip_venv --python_path="/bazel_pip/bin/python3"
 test:pip_venv --define=no_tensorflow_py_deps=true
 test:pip --config=pip_venv
 # Yes, we don't exclude the gpu tests on pip for some reason.
-test:pip_filters --test_tag_filters=-nopip,-no_pip,-no_oss,-oss_serial,-v1only
-test:pip_filters --build_tag_filters=-nopip,-no_pip,-no_oss,-oss_serial,-v1only
+test:pip_filters --test_tag_filters=-nopip,-no_pip,-no_oss,-oss_excluded,-oss_serial,-v1only
+test:pip_filters --build_tag_filters=-nopip,-no_pip,-no_oss,-oss_excluded,-oss_serial,-v1only
 test:pip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pip --config=pip_filters -- //bazel_pip/tensorflow/... -//bazel_pip/tensorflow/python/integration_testing/... -//bazel_pip/tensorflow/compiler/tf2tensorrt/... -//bazel_pip/tensorflow/compiler/xrt/... -//bazel_pip/tensorflow/core/tpu/... -//bazel_pip/tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -117,7 +117,7 @@ build:rbe --remote_instance_name=projects/tensorflow-testing/instances/default_i
 build:rbe --project_id="tensorflow-testing"
 
 # For continuous builds
-test:pycpp_filters --test_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
-test:pycpp_filters --build_tag_filters=-no_oss,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:pycpp_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
+test:pycpp_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only
 test:pycpp_filters --test_lang_filters=cc,py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pycpp --config=pycpp_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu.bazelrc b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu.bazelrc
index d6f129837de..a9213848787 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu.bazelrc
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu.bazelrc
@@ -69,8 +69,8 @@ test --test_summary=short
 # Pass --config=nonpip to run the same suite of tests. If you want to run just
 # one test for investigation, you don't need --config=nonpip; just run the
 # bazel test invocation as normal.
-test:nonpip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_oss_py38,-no_oss_py39,-no_oss_py310
-test:nonpip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:nonpip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:nonpip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_oss_py38,-no_oss_py39,-no_oss_py310
 test:nonpip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:nonpip --config=nonpip_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -92,8 +92,8 @@ test:pip_venv --action_env PYTHON_LIB_PATH="/bazel_pip/lib/python3/site-packages
 test:pip_venv --python_path="/bazel_pip/bin/python3"
 test:pip_venv --define=no_tensorflow_py_deps=true
 # Yes, we don't exclude the gpu tests on pip for some reason.
-test:pip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_pip,-nopip,-no_oss_py38,-no_oss_py39,-no_oss_py310
-test:pip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_pip,-nopip,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:pip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_pip,-nopip,-no_oss_py38,-no_oss_py39,-no_oss_py310
+test:pip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_pip,-nopip,-no_oss_py38,-no_oss_py39,-no_oss_py310
 test:pip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pip --config=pip_venv --config=pip_filters -- //bazel_pip/tensorflow/... -//bazel_pip/tensorflow/python/integration_testing/... -//bazel_pip/tensorflow/compiler/tf2tensorrt/... -//bazel_pip/tensorflow/compiler/xrt/... -//bazel_pip/tensorflow/core/tpu/... -//bazel_pip/tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -136,7 +136,7 @@ build:rbe --repo_env=TF_NCCL_CONFIG_REPO="@sigbuild-r2.12_config_nccl"
 build:rbe --repo_env=TF_PYTHON_CONFIG_REPO="@sigbuild-r2.12_config_python"
 
 # For continuous builds
-test:pycpp_filters --test_tag_filters=-no_oss,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
-test:pycpp_filters --build_tag_filters=-no_oss,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
+test:pycpp_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
+test:pycpp_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
 test:pycpp_filters --test_lang_filters=cc,py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pycpp --config=pycpp_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu_clang.bazelrc b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu_clang.bazelrc
index 10351836a95..2a1704b924a 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu_clang.bazelrc
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/gpu_clang.bazelrc
@@ -80,8 +80,8 @@ test --test_summary=short
 # Pass --config=nonpip to run the same suite of tests. If you want to run just
 # one test for investigation, you don't need --config=nonpip; just run the
 # bazel test invocation as normal.
-test:nonpip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11
-test:nonpip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11
+test:nonpip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11
+test:nonpip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11
 test:nonpip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:nonpip --config=nonpip_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -103,8 +103,8 @@ test:pip_venv --action_env PYTHON_LIB_PATH="/bazel_pip/lib/python3/site-packages
 test:pip_venv --python_path="/bazel_pip/bin/python3"
 test:pip_venv --define=no_tensorflow_py_deps=true
 # Yes, we don't exclude the gpu tests on pip for some reason.
-test:pip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_pip,-nopip
-test:pip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_serial,-no_cuda11,-no_pip,-nopip
+test:pip_filters --test_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_pip,-nopip
+test:pip_filters --build_tag_filters=gpu,requires-gpu,-no_gpu,-no_oss,-oss_excluded,-oss_serial,-no_cuda11,-no_pip,-nopip
 test:pip_filters --test_lang_filters=py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pip --config=pip_venv --config=pip_filters -- //bazel_pip/tensorflow/... -//bazel_pip/tensorflow/python/integration_testing/... -//bazel_pip/tensorflow/compiler/tf2tensorrt/... -//bazel_pip/tensorflow/compiler/xrt/... -//bazel_pip/tensorflow/core/tpu/... -//bazel_pip/tensorflow/lite/... -//tensorflow/tools/toolchains/...
 
@@ -147,7 +147,7 @@ build:rbe --repo_env=TF_NCCL_CONFIG_REPO="@sigbuild-r2.12-clang_config_nccl"
 build:rbe --repo_env=TF_PYTHON_CONFIG_REPO="@sigbuild-r2.12-clang_config_python"
 
 # For continuous builds
-test:pycpp_filters --test_tag_filters=-no_oss,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
-test:pycpp_filters --build_tag_filters=-no_oss,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
+test:pycpp_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
+test:pycpp_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11
 test:pycpp_filters --test_lang_filters=cc,py --flaky_test_attempts=3 --test_size_filters=small,medium
 test:pycpp --config=pycpp_filters -- //tensorflow/... -//tensorflow/python/integration_testing/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/compiler/xrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/...