Squashed commit of the following:

commit fc7149e Merge: 0e942ed 0143e13 Author: Chris Breiding <chrisbreiding@gmail.com> Date: Wed Feb 23 10:28:34 2022 -0500 Merge branch 'develop' into feature-multidomain commit 0e942ed Author: Chris Breiding <chrisbreiding@users.noreply.github.com> Date: Wed Feb 23 10:28:03 2022 -0500 chore: Refactor multi-domain communication lifecycle (#20247) commit 0143e13 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Feb 21 23:01:35 2022 +0000 fix(deps): update dependency url-parse to v1.5.6 [security] (#20270) Co-authored-by: Renovate Bot <bot@renovateapp.com> commit 1fb16b0 Author: Zach Bloomquist <git@chary.us> Date: Sun Feb 20 16:22:08 2022 -0500 chore: fix cache keys to include PLATFORM (#20279) * chore: fix cache keys to include PLATFORM * build this branch * try using platform_key commit 65ea8f7 Author: Ryan Manuel <ryanm@cypress.io> Date: Fri Feb 18 17:57:34 2022 -0600 chore: fix server performance flake (#20271) commit ad2f4de Author: Zach Bloomquist <git@chary.us> Date: Fri Feb 18 18:37:22 2022 -0500 test(system-tests): support docker-based tests against built binary (#20250) Co-authored-by: Ryan Manuel <ryanm@cypress.io> commit 75c8750 Author: Ryan Manuel <ryanm@cypress.io> Date: Fri Feb 18 12:54:26 2022 -0600 chore: fix system-test-firefox screenshots_spec flake (#20268) commit 8d28261 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Fri Feb 18 10:33:27 2022 -0600 chore(deps): update dependency fs-extra to v9 🌟 (#19939) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com> Co-authored-by: David Munechika <david@cypress.io> commit ad50062 Author: Johannes Ewald <mail@johannesewald.de> Date: Thu Feb 17 19:21:08 2022 +0100 fix: Wait for child process to be ready (#19792) Co-authored-by: Zach Bloomquist <github@chary.us> Co-authored-by: Zach Bloomquist <git@chary.us> commit 0d3e645 Author: Marco Lauinger <marco.lauinger@gmail.com> Date: Thu Feb 17 19:20:33 2022 +0100 fix: treat form-data bodies as binary (#20144) commit 42b0fce Author: Zach Bloomquist <git@chary.us> Date: Wed Feb 16 13:53:04 2022 -0500 test: replace cypress-test-example-repos coverage + remove bump (#20186) commit e55974c Merge: f84bac5 ce956de Author: Blue F <blue@cypress.io> Date: Wed Feb 16 09:47:06 2022 -0800 Merge pull request #20079 from cypress-io/issue-19403-perf-reporter-changes chore: Performance reporter changes commit f84bac5 Author: Ali Kireçligöl <alikirecligol@gmail.com> Date: Wed Feb 16 20:22:57 2022 +0300 fix(driver): update wrapErr to ignore number and boolean values (#20172) Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com> commit 1e6f51a Author: BlueWinds <blue@everblue.info> Date: Tue Feb 15 10:18:49 2022 -0800 release 9.5.0 [skip ci] commit 507b96f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue Feb 15 06:35:08 2022 -0600 chore: Update Chrome (stable) to 98.0.4758.102 (#20192) Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com> commit e8d7120 Merge: dff45ca bb26e98 Author: BlueWinds <blue@everblue.info> Date: Mon Feb 14 14:15:27 2022 -0800 Merge remote-tracking branch 'origin/master' into develop commit dff45ca Merge: a3f0d63 2bad703 Author: Blue F <blue@cypress.io> Date: Mon Feb 14 12:59:52 2022 -0800 Merge pull request #20142 from cypress-io/9b967e06f5-master-into-develop chore: merge master (9b967e0) into develop commit 2bad703 Merge: 9b967e0 a3f0d63 Author: Blue F <blue@cypress.io> Date: Mon Feb 14 12:26:14 2022 -0800 Merge branch 'develop' into 9b967e0-master-into-develop commit ce956de Author: BlueWinds <blue@everblue.info> Date: Mon Feb 14 08:21:15 2022 -0800 Add span names, merge develop commit ac1faf4 Merge: 961e764 2c88f0c Author: BlueWinds <blue@everblue.info> Date: Mon Feb 14 08:19:17 2022 -0800 Merge remote-tracking branch 'origin/develop' into issue-19403-perf-reporter-changes commit 961e764 Author: BlueWinds <blue@everblue.info> Date: Thu Feb 10 14:21:44 2022 -0800 Move sending root event to own script commit bb26e98 Author: semantic-release-bot <semantic-release-bot@martynus.net> Date: Thu Feb 10 15:16:39 2022 -0500 chore: release @cypress/vue-v3.1.1 [skip ci] commit 6a96ca5 Author: semantic-release-bot <semantic-release-bot@martynus.net> Date: Thu Feb 10 15:16:23 2022 -0500 chore: release @cypress/react-v5.12.3 [skip ci] commit 9b967e0 Author: Lachlan Miller <lachlan.miller.1990@outlook.com> Date: Thu Feb 10 16:26:20 2022 +1000 fix: set correct default when using react-scripts plugin (#20141) commit e709184 Merge: e0bf811 97e6c14 Author: Barthélémy Ledoux <bart@cypress.io> Date: Wed Feb 9 20:03:05 2022 -0600 Merge pull request #20132 from cypress-io/elevatebart/trigger-vue-release commit 97e6c14 Author: ElevateBart <ledouxb@gmail.com> Date: Wed Feb 9 17:52:38 2022 -0600 fix: create a dummy commit to trigger release commit fa0b68a Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 14:50:04 2022 -0800 Fix path commit f7c46fc Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 14:35:00 2022 -0800 Refactor async data into more convenient helper commit 57decf4 Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 13:21:57 2022 -0800 Include honeycomb key so we can send root event commit 3cf4a2b Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 12:55:50 2022 -0800 Reduce event duplication commit 9d433c7 Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 12:50:24 2022 -0800 Send root honeycomb event even if node_modules cache already exists commit 705262f Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 10:48:17 2022 -0800 Fix commit b9c0d5e Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 10:37:52 2022 -0800 fix indentation commit f694bd2 Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 10:33:15 2022 -0800 Another attempt to wrap all events into one trace commit 5e96b5c Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 09:52:17 2022 -0800 Attepmt to associate all circleci jobs for a given build into one trace commit 980b951 Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 09:34:59 2022 -0800 Tweak honeycomb events further commit b8f1b4f Merge: 0d834bc 52ed6ed Author: BlueWinds <blue@everblue.info> Date: Tue Feb 8 09:12:20 2022 -0800 Merge remote-tracking branch 'origin/develop' into issue-19403-perf-reporter-changes commit 0d834bc Author: BlueWinds <blue@everblue.info> Date: Mon Feb 7 12:25:35 2022 -0800 Add data to all events sent, not just top level commit ac5bfd3 Author: BlueWinds <blue@everblue.info> Date: Mon Feb 7 11:37:55 2022 -0800 Use honeycomb tracing commit 304d8bd Author: BlueWinds <blue@everblue.info> Date: Mon Feb 7 10:22:04 2022 -0800 Make performance-reporter for system tests use get-next-version script
cypress-io · Feb 23, 2022 · 96d86c7 · 96d86c7
1 parent 07d8255
commit 96d86c7
Show file tree

Hide file tree

Showing 73 changed files with 1,363 additions and 1,153 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,6 @@ Thanks for taking the time to contribute! :smile:
 
 ## Table of Contents
 
-- [CI Status](#ci-status)
 - [Code of Conduct](#code-of-conduct)
 - [Opening Issues](#opening-issues)
 - [Triaging Issues](#triaging-issues)
@@ -42,20 +41,6 @@ Thanks for taking the time to contribute! :smile:
   - [Code Review of Dependency Updates](#Code-Review-of-Dependency-Updates)
 - [Deployment](#deployment)
 
-## CI status
-
-| Build status                                                                                                                                                                                                        | Description                                                                                |
-| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :----------------------------------------------------------------------------------------- |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-node-versions.svg?style=svg&circle-token=6a7c4e7e7ab427e11bea6c2af3df29c4491d2376)](https://circleci.com/gh/cypress-io/cypress-test-node-versions)     | [cypress-test-node-versions](https://github.com/cypress-io/cypress-test-node-versions)     |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-ci-environments.svg?style=svg&circle-token=66a4d36c3966cbe476f13e7dfbe3af0693db3fb9)](https://circleci.com/gh/cypress-io/cypress-test-ci-environments) | [cypress-test-ci-environments](https://github.com/cypress-io/cypress-test-ci-environments) |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-module-api.svg?style=svg&circle-token=317f79ae796e0ffd6cc7dd90859c0f67e5a306e7)](https://circleci.com/gh/cypress-io/cypress-test-module-api)           | [cypress-test-module-api](https://github.com/cypress-io/cypress-test-module-api)           |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-nested-projects.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress-test-nested-projects)                                                       | [cypress-test-nested-projects](https://github.com/cypress-io/cypress-test-nested-projects) |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-on.svg?style=svg&circle-token=51ba85f5720654ee58212f45f6b9afc56d55d52a)](https://circleci.com/gh/cypress-io/cypress-on)                                     | [cypress-on](https://github.com/cypress-io/cypress-on)                                     |
-| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-node-versions.svg?style=svg&circle-token=6a7c4e7e7ab427e11bea6c2af3df29c4491d2376)](https://circleci.com/gh/cypress-io/cypress-test-node-versions)     | [cypress-test-example-repos](https://github.com/cypress-io/cypress-test-example-repos)     |
-| [![CircleCI](https://circleci.com/gh/cypress-io/docsearch-scraper.svg?style=svg&circle-token=8087137233788ec1eab4f79d4451392ca53183b2)](https://circleci.com/gh/cypress-io/docsearch-scraper)                       | [docsearch-scraper](https://github.com/cypress-io/docsearch-scraper)                       |
-| [![Docker Build Status](https://img.shields.io/docker/build/cypress/base.svg)](https://hub.docker.com/r/cypress/base/)                                                                                              | [cypress-docker-images](https://github.com/cypress-io/cypress-docker-images)               |
-| [![Build status](https://ci.appveyor.com/api/projects/status/ln8tg3dv42nk916c?svg=true)](https://ci.appveyor.com/project/cypress-io/cypress)                                                                        | Windows CI                                                                                 |
-
 ## Code of Conduct
 
 All contributors are expecting to abide by our [Code of Conduct](./CODE_OF_CONDUCT.md).

diff --git a/__snapshots__/bump-spec.js b/__snapshots__/bump-spec.js
@@ -1,40 +1,15 @@
 exports['list of all projects'] = [
-  {
-    "repo": "cypress-io/cypress-test-example-repos",
-    "provider": "circle",
-    "platform": "win32"
-  },
   {
     "repo": "cypress-io/cypress-test-module-api",
     "provider": "circle",
     "platform": "linux"
-  },
-  {
-    "repo": "cypress-io/cypress-test-node-versions",
-    "provider": "circle",
-    "platform": "linux"
-  },
-  {
-    "repo": "cypress-io/cypress-test-ci-environments",
-    "provider": "circle",
-    "platform": "linux"
-  },
-  {
-    "repo": "cypress-io/cypress-test-example-repos",
-    "provider": "circle",
-    "platform": "linux"
-  },
-  {
-    "repo": "cypress-io/cypress-test-example-repos",
-    "provider": "circle",
-    "platform": "darwin"
   }
 ]
 
-exports['should have just circle and darwin projects'] = [
+exports['should have just circle and linux projects'] = [
   {
-    "repo": "cypress-io/cypress-test-example-repos",
+    "repo": "cypress-io/cypress-test-module-api",
     "provider": "circle",
-    "platform": "darwin"
+    "platform": "linux"
   }
 ]
diff --git a/browser-versions.json b/browser-versions.json
@@ -1,4 +1,4 @@
 {
   "chrome:beta": "99.0.4844.27",
-  "chrome:stable": "98.0.4758.80"
+  "chrome:stable": "98.0.4758.102"
 }
diff --git a/circle.yml b/circle.yml
@@ -11,7 +11,7 @@ defaults: &defaults
       type: boolean
       default: false
   executor: <<parameters.executor>>
-  environment:
+  environment: &defaultsEnvironment
     ## set specific timezone
     TZ: "/usr/share/zoneinfo/America/New_York"
 
@@ -29,7 +29,7 @@ mainBuildFilters: &mainBuildFilters
       only:
         - develop
         - 10.0-release
-        - fix-ci-artifact-uploads
+        - fix-darwin-win32-node-modules-install
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -38,7 +38,7 @@ macWorkflowFilters: &mac-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ renovate/cypress-request-2.x, << pipeline.git.branch >> ]
+    - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -48,7 +48,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     or:
     - equal: [ master, << pipeline.git.branch >> ]
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ test-binary-downstream-windows, << pipeline.git.branch >> ]
+    - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -167,9 +167,12 @@ commands:
       - run:
           name: Generate Circle Cache Key
           command: node scripts/circle-cache.js --action cacheKey > circle_cache_key
+      - run:
+          name: Generate platform key
+          command: echo $PLATFORM > platform_key
       - restore_cache:
           name: Restore cache state, to check for known modules cache existence
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-node-modules-cache-{{ checksum "circle_cache_key" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
       - run:
           name: Move node_modules back from /tmp
           command: |
@@ -190,48 +193,57 @@ commands:
       - run:
           name: Generate Circle Cache key for system tests
           command: ./system-tests/scripts/cache-key.sh > system_tests_cache_key
+      - run:
+          name: Generate platform key
+          command: echo $PLATFORM > platform_key
       - restore_cache:
           name: Restore system tests node_modules cache
           keys:
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-
 
   update_cached_system_tests_deps:
     description: 'Update the cached node_modules for projects in "system-tests/projects/**"'
     steps:
       - run:
           name: Generate Circle Cache key for system tests
           command: ./system-tests/scripts/cache-key.sh > system_tests_cache_key
+      - run:
+          name: Generate platform key
+          command: echo $PLATFORM > platform_key
       - restore_cache:
           name: Restore cache state, to check for known modules cache existence
           keys:
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
+      - run:
+          name: Send root honeycomb event for this CI build
+          command: cd system-tests/scripts && node ./send-root-honecomb-event.js
       - run:
           name: Bail if specific cache exists
           command: |
-            if [[ -f "system_tests_node_modules_installed" ]]; then
+            if [[ -f "/tmp/system_tests_node_modules_installed" ]]; then
               echo "No updates to system tests node modules, exiting"
               circleci-agent step halt
             fi
       - restore_cache:
           name: Restore system tests node_modules cache
           keys:
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-
       - run:
           name: Update system-tests node_modules cache
           command: yarn workspace @tooling/system-tests projects:yarn:install
       - save_cache:
           name: Save system tests node_modules cache
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
           paths:
             - ~/.cache/cy-system-tests-node-modules
-      - run: touch system_tests_node_modules_installed
+      - run: touch /tmp/system_tests_node_modules_installed
       - save_cache:
           name: Save system tests node_modules cache state key
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
           paths:
-            - system_tests_node_modules_installed
+            - /tmp/system_tests_node_modules_installed
 
   caching-dependency-installer:
     description: 'Installs & caches the dependencies based on yarn lock & package json dependencies'
@@ -244,21 +256,24 @@ commands:
       - run:
           name: Generate Circle Cache Key
           command: node scripts/circle-cache.js --action cacheKey > circle_cache_key
+      - run:
+          name: Generate platform key
+          command: echo $PLATFORM > platform_key
       - restore_cache:
           name: Restore cache state, to check for known modules cache existence
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-node-modules-cache-state-{{ checksum "circle_cache_key" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
       - run:
           name: Bail if cache exists
           command: |
-            if [[ -f "node_modules_installed" ]]; then
+            if [[ -f "/tmp/node_modules_installed" ]]; then
               echo "Node modules already cached for dependencies, exiting"
               circleci-agent step halt
             fi
       - run: date +%Y-%U > cache_date
       - restore_cache:
           name: Restore weekly yarn cache
           keys:
-            - v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-deps-root-weekly-{{ checksum "cache_date" }}
+            - v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-deps-root-weekly-{{ checksum "cache_date" }}
       - run:
           name: Install Node Modules
           command: |
@@ -271,7 +286,7 @@ commands:
           steps:
             - save_cache:
                 name: Saving node modules for root, cli, and all globbed workspace packages
-                key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-node-modules-cache-{{ checksum "circle_cache_key" }}
+                key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
                 paths:
                   - node_modules
                   - cli/node_modules
@@ -282,18 +297,18 @@ commands:
           steps:
             - save_cache:
                 name: Saving node modules for root, cli, and all globbed workspace packages
-                key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-node-modules-cache-{{ checksum "circle_cache_key" }}
+                key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
                 paths:
                   - /tmp/node_modules_cache
-      - run: touch node_modules_installed
+      - run: touch /tmp/node_modules_installed
       - save_cache:
           name: Saving node-modules cache state key
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-node-modules-cache-state-{{ checksum "circle_cache_key" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
           paths:
-            - node_modules_installed
+            - /tmp/node_modules_installed
       - save_cache:
           name: Save weekly yarn cache
-          key: v{{ .Environment.CACHE_VERSION }}-{{ arch }}-test2-deps-root-weekly-{{ checksum "cache_date" }}
+          key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-deps-root-weekly-{{ checksum "cache_date" }}
           paths:
             - ~/.yarn
 
@@ -516,6 +531,24 @@ commands:
           path: /tmp/artifacts
       - store-npm-logs
 
+  run-binary-system-tests:
+    steps:
+      - restore_cached_workspace
+      - restore_cached_system_tests_deps
+      - run:
+          name: Run system tests
+          command: |
+            ALL_SPECS=`circleci tests glob "$HOME/cypress/system-tests/test-binary/*spec*"`
+            SPECS=`echo $ALL_SPECS | xargs -n 1 | circleci tests split --split-by=timings`
+            echo SPECS=$SPECS
+            yarn workspace @tooling/system-tests test:ci $SPECS
+      - verify-mocha-results
+      - store_test_results:
+          path: /tmp/cypress
+      - store_artifacts:
+          path: /tmp/artifacts
+      - store-npm-logs
+
   store-npm-logs:
     description: Saves any NPM debug logs as artifacts in case there is a problem
     steps:
@@ -1159,6 +1192,20 @@ jobs:
       - restore_cached_workspace
       - update_cached_system_tests_deps
 
+  binary-system-tests:
+    parallelism: 2
+    working_directory: ~/cypress
+    environment:
+      <<: *defaultsEnvironment
+      PLATFORM: linux
+    machine:
+      # using `machine` gives us a Linux VM that can run Docker
+      image: ubuntu-2004:202111-02
+      docker_layer_caching: true
+    resource_class: medium
+    steps:
+      - run-binary-system-tests
+
   system-tests-chrome:
     <<: *defaults
     resource_class: medium
@@ -1579,7 +1626,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-ci-artifact-uploads" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -1887,6 +1934,22 @@ jobs:
           repo: cypress-example-recipes
           command: npm run test:ci:firefox
 
+  test-binary-against-recipes-chrome:
+    <<: *defaults
+    parallelism: 3
+    steps:
+      - test-binary-against-repo:
+          repo: cypress-example-recipes
+          command: npm run test:ci:chrome
+
+  test-binary-against-recipes:
+    <<: *defaults
+    parallelism: 3
+    steps:
+      - test-binary-against-repo:
+          repo: cypress-example-recipes
+          command: npm run test:ci
+
   # This is a special job. It allows you to test the current
   # built test runner against a pull request in the repo
   # cypress-example-recipes.
@@ -2042,6 +2105,7 @@ linux-workflow: &linux-workflow
         requires:
           - build
     - system-tests-node-modules-install:
+        context: test-runner:performance-tracking
         requires:
           - build
     - system-tests-chrome:
@@ -2222,16 +2286,22 @@ linux-workflow: &linux-workflow
         <<: *mainBuildFilters
         requires:
           - create-build-artifacts
-
     - test-binary-against-kitchensink-chrome:
         <<: *mainBuildFilters
         requires:
           - create-build-artifacts
-
     - test-binary-against-recipes-firefox:
         <<: *mainBuildFilters
         requires:
           - create-build-artifacts
+    - test-binary-against-recipes-chrome:
+        <<: *mainBuildFilters
+        requires:
+          - create-build-artifacts
+    - test-binary-against-recipes:
+        <<: *mainBuildFilters
+        requires:
+          - create-build-artifacts
     - test-binary-against-kitchensink-firefox:
         <<: *mainBuildFilters
         requires:
@@ -2244,17 +2314,19 @@ linux-workflow: &linux-workflow
         <<: *mainBuildFilters
         requires:
           - create-build-artifacts
-
     - test-binary-as-specific-user:
         name: "test binary as a non-root user"
         executor: non-root-docker-user
         requires:
           - create-build-artifacts
-
     - test-binary-as-specific-user:
         name: "test binary as a root user"
         requires:
           - create-build-artifacts
+    - binary-system-tests:
+        requires:
+          - create-build-artifacts
+          - system-tests-node-modules-install
 
 mac-workflow: &mac-workflow
   jobs: