message: Adding back no_pip and nopip tags. Removing gpu related tags.
diff: # the package.
  #
  # Usage:
  -# pip.sh
  +# pip_new.sh
  #
  # Required step(s):
  # Run configure.py prior to running this script.
  # --build_tests_only --test_output=errors"
  # TF_TEST_FILTER_TAGS: Filtering tags for bazel tests. More specifically,
  # input tags for `--test_filter_tags` flag.
  -# e.g. TF_TEST_FILTER_TAGS="no-pip,-nomac,no_oss"
  +# e.g. TF_TEST_FILTER_TAGS="no_pip,-nomac,no_oss"
  # TF_TEST_TARGETS: Bazel test targets.
  # e.g. TF_TEST_TARGETS="//tensorflow/contrib/... \
  # //tensorflow/... \
  # test_pip_virtualenv_oss_serial"
  # IS_NIGHTLY: Nightly run flag.
  # e.g. IS_NIGHTLY=1 # nightly runs
  -# IS_NIGHTLY=0 # non-nightly runs
  +# e.g. IS_NIGHTLY=0 # non-nightly runs
  # TF_PROJECT_NAME: Name of the project. This string will be pass onto
  # the wheel file name. For nightly builds, it will be
  # overwritten to 'tf_nightly'. For gpu builds, '_gpu'
  @@ -140,16 +140,13 @@ update_bazel_flags() {
  update_test_filter_tags() {
  # Add test filter tags
  + # This script is for validating built PIP packages. Add pip tags.
  + add_test_filter_tag -no_pip -nopip
  # MacOS filter tags
  if [[ ${OS_TYPE} == "macos" ]]; then
  remove_test_filter_tag nomac no_mac
  add_test_filter_tag -nomac -no_mac
  fi
  - # GPU or CPU tags
  - if [[ "${CONTAINER_TYPE}" == "gpu" ]]; then
  - remove_test_filter_tag no_gpu -requires-gpu
  - add_test_filter_tag requires-gpu
  - fi
  echo "Final test filter tags: ${BAZEL_TEST_FILTER_TAGS}"
  }
  @@ -251,7 +248,13 @@ INSTALL_EXTRA_PIP_PACKAGES=${TF_BUILD_INSTALL_EXTRA_PIP_PACKAGES}
  # Build TF PIP Package
  ###########################################################################
  -# First, check that global variables are properly set.
  +# First remove any already existing binaries for a clean start and test.
  +if [[ -d ${PIP_TEST_ROOT} ]]; then
  + echo "Test root directory ${PIP_TEST_ROOT} already exists. Deleting it."
  + sudo rm -rf ${PIP_TEST_ROOT}
  +fi
  +
  +# Check that global variables are properly set.
  check_global_vars
  # Check if in a virtualenv and exit if yes.
  @@ -288,6 +291,7 @@ test_pip_virtualenv_clean() {
  # activate virtual environment and install tensorflow with PIP.
  create_activate_virtualenv --clean "${CLEAN_VENV_DIR}"
  + # Install TF with pip
  install_tensorflow_pip "${WHL_PATH}"
  # cd to a temporary directory to avoid picking up Python files in the source
  