From c9648444e82fa105d33f95443c6bb64b23c6117f Mon Sep 17 00:00:00 2001
From: Marc Fisher <fisherii@google.com>
Date: Fri, 23 Aug 2019 22:27:23 -0700
Subject: [PATCH] Fix files for release. (#380)

Minor updates to the CI configs.
---
 .bazelci/presubmit.yml     |  2 +-
 .travis.yml                |  2 +-
 build_files/metadata.BUILD |  2 +-
 build_files/wsl.BUILD      |  2 +-
 build_files/wtl.BUILD      |  2 +-
 testing/web/BUILD.bazel    | 18 ++++++++++++++++++
 tools/copy.bara.sky        |  6 +++---
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index ffc216a0..b27c575d 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -5,7 +5,7 @@ platforms:
     build_targets:
     - "//..."
     test_flags:
-    - "--test_tag_filters=-noci,-external,-native,-chrome-win10-connect"
+    - "--test_tag_filters=-noci,-external,-native"
     - "--test_output=streamed"
     test_targets:
     - "//..."
diff --git a/.travis.yml b/.travis.yml
index dd5e3f8a..cd3c91c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
 
 script:
     - |
-      FILTERS="-noci,-native"
+      FILTERS="-noci,-notravis,-native"
       if [[ "${TRAVIS_PULL_REQUEST}" != "false" ]]; then
         FILTERS="${FILTERS},-sauce"
       fi
diff --git a/build_files/metadata.BUILD b/build_files/metadata.BUILD
index d02f0697..1070047e 100644
--- a/build_files/metadata.BUILD
+++ b/build_files/metadata.BUILD
@@ -19,7 +19,7 @@ licenses(["notice"])  # Apache 2.0
 alias(
     name = "main",
     actual  = select({
-        "//common/conditions:linux": "linux_amd64_stripped/main",
+        "//common/conditions:linux": "linux_amd64_pure_stripped/main",
         "//common/conditions:mac": "darwin_amd64_pure_stripped/main",
         "//common/conditions:windows": "windows_amd64_pure_stripped/main.exe",
     }),
diff --git a/build_files/wsl.BUILD b/build_files/wsl.BUILD
index cddb62aa..91e376b9 100644
--- a/build_files/wsl.BUILD
+++ b/build_files/wsl.BUILD
@@ -22,7 +22,7 @@ web_test_named_executable(
     name = "wsl",
     alt_name = "WEBDRIVER_SERVER_LIGHT",
     executable = select({
-        "//common/conditions:linux": "main/linux_amd64_stripped/main",
+        "//common/conditions:linux": "main/linux_amd64_pure_stripped/main",
         "//common/conditions:mac": "main/darwin_amd64_pure_stripped/main",
         "//common/conditions:windows": "main/windows_amd64_pure_stripped/main.exe",
     }),
diff --git a/build_files/wtl.BUILD b/build_files/wtl.BUILD
index d02f0697..1070047e 100644
--- a/build_files/wtl.BUILD
+++ b/build_files/wtl.BUILD
@@ -19,7 +19,7 @@ licenses(["notice"])  # Apache 2.0
 alias(
     name = "main",
     actual  = select({
-        "//common/conditions:linux": "linux_amd64_stripped/main",
+        "//common/conditions:linux": "linux_amd64_pure_stripped/main",
         "//common/conditions:mac": "darwin_amd64_pure_stripped/main",
         "//common/conditions:windows": "windows_amd64_pure_stripped/main.exe",
     }),
diff --git a/testing/web/BUILD.bazel b/testing/web/BUILD.bazel
index 6af87b9c..8d530256 100644
--- a/testing/web/BUILD.bazel
+++ b/testing/web/BUILD.bazel
@@ -38,5 +38,23 @@ py_web_test_suite(
         "//browsers/sauce:chrome-win10",
         "//browsers/sauce:chrome-win10-connect",
     ],
+    tags = {
+        "chromium-local": [
+            "native",
+        ],
+        "chrome-win10": [
+            "exclusive",
+            "sauce",
+            "notravis",
+        ],
+        "chrome-win10-connect": [
+            "exclusive",
+            "noci",
+            "sauce",
+        ],
+        "firefox-local": [
+            "native",
+        ],
+    },
     deps = [":web"],
 )
diff --git a/tools/copy.bara.sky b/tools/copy.bara.sky
index 4ccaab68..05773ec0 100644
--- a/tools/copy.bara.sky
+++ b/tools/copy.bara.sky
@@ -30,9 +30,9 @@ core.workflow(
             "common/**",
             "go/bazel/**",
             "go/cmdhelper/**",
+            "go/httphelper/**",
             "go/metadata/**",
             "go/portpicker/**",
-            "go/screenshotter/**",
             "go/webtest/**",
             "java/**",
             "javatests/**",
@@ -54,8 +54,8 @@ core.workflow(
     ),
     transformations = [
         core.move("bazel-bin/go/metadata/main", "go/metadata/main"),
-        core.move("bazel-bin/go/wsl", "go/wsl"),
-        core.move("bazel-bin/go/wtl", "go/wtl"),
+        core.move("bazel-bin/go/wsl/main", "go/wsl/main"),
+        core.move("bazel-bin/go/wtl/main", "go/wtl/main"),
         core.move("build_files/metadata.BUILD", "go/metadata/main/BUILD.bazel"),
         core.move("build_files/wsl.BUILD", "go/wsl/BUILD.bazel"),
         core.move("build_files/wtl.BUILD", "go/wtl/main/BUILD.bazel"),