From a5f2dc0d7e699226660831b4f2ba166fb57fb26e Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Mon, 28 Feb 2022 22:19:15 -0800
Subject: [PATCH] tests: bring back test runner bots as they were (#12423)

---
 .github/workflows/test_test_runner.yml | 53 --------------------------
 .github/workflows/tests_primary.yml    | 29 ++++++++++++++
 2 files changed, 29 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/test_test_runner.yml

diff --git a/.github/workflows/test_test_runner.yml b/.github/workflows/test_test_runner.yml
deleted file mode 100644
index 3bbef5b90a..0000000000
--- a/.github/workflows/test_test_runner.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: "Test Runner"
-on:
-  push:
-    branches:
-      - main
-      - release-*
-    paths:
-      - ".github/workflows/test_test_runner.yml"
-      - "tests/playwright-test/**/*"
-      - "packages/playwright-test/**/*"
-      - "package.json"
-  pull_request:
-    branches:
-      - main
-      - release-*
-    paths:
-      - ".github/workflows/test_test_runner.yml"
-      - "tests/playwright-test/**/*"
-      - "packages/playwright-test/**/*"
-      - "package.json"
-  workflow_dispatch:
-
-env:
-  # Force terminal colors. @see https://www.npmjs.com/package/colors
-  FORCE_COLOR: 1
-  FLAKINESS_CONNECTION_STRING: ${{ secrets.FLAKINESS_CONNECTION_STRING }}
-
-jobs:
-  test:
-    name: Test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [12, 16]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{matrix.node-version}}
-    - run: npm i -g npm@8.3
-    - run: npm ci
-      env:
-        DEBUG: pw:install
-    - run: npm run build
-    - run: npx playwright install --with-deps
-    - run: npm run ttest
-      if: matrix.os != 'ubuntu-latest'
-    - run: xvfb-run npm run ttest
-      if: matrix.os == 'ubuntu-latest'
-    - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
-      if: always()
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
index fa7b101694..1b39ec9bf1 100644
--- a/.github/workflows/tests_primary.yml
+++ b/.github/workflows/tests_primary.yml
@@ -49,6 +49,35 @@ jobs:
         name: ${{ matrix.browser }}-${{ matrix.os }}-test-results
         path: test-results
 
+  test_test_runner:
+    name: Test Runner
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [12]
+        include:
+        - os: ubuntu-latest
+          node-version: 16
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{matrix.node-version}}
+    - run: npm i -g npm@8.3
+    - run: npm ci
+      env:
+        DEBUG: pw:install
+    - run: npm run build
+    - run: npx playwright install --with-deps
+    - run: npm run ttest
+      if: matrix.os != 'ubuntu-latest'
+    - run: xvfb-run npm run ttest
+      if: matrix.os == 'ubuntu-latest'
+    - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
+      if: always()
+
   test_html_report:
     name: HTML Report
     runs-on: ubuntu-latest