From 0d09f12c4d51a0cbab012c4c86f0699c71993a2f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 23 Aug 2020 13:28:16 +0200
Subject: [PATCH] workflows: update e2e test workflows

---
 .github/workflows/{cli-win.yml => e2e-win.yml} | 14 ++++++++------
 .github/workflows/{cli.yml => e2e.yml}         | 14 +++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)
 rename .github/workflows/{cli-win.yml => e2e-win.yml} (77%)
 rename .github/workflows/{cli.yml => e2e.yml} (87%)

diff --git a/.github/workflows/cli-win.yml b/.github/workflows/e2e-win.yml
similarity index 77%
rename from .github/workflows/cli-win.yml
rename to .github/workflows/e2e-win.yml
index 4e7a186282..5f75f3d9c8 100644
--- a/.github/workflows/cli-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -1,12 +1,13 @@
-name: CLI Test Windows
+name: E2E Test Windows
 
-# Building on windows is really slow, so this workflow is separate from cli.yml and only builds on changes
+# Building on windows is really slow, so this workflow is separate from e2e.yml and only builds on changes
 # to the cli itself. They're more likely to introduce issues on windows, compared to changes to core and yarn.lock.
 on:
   pull_request:
     paths:
-      - '.github/workflows/cli-win.yml'
+      - '.github/workflows/e2e-win.yml'
       - 'packages/cli/**'
+      - 'packages/e2e/**'
       - 'packages/create-app/**'
 
 jobs:
@@ -42,6 +43,7 @@ jobs:
       - name: yarn install
         run: yarn install --frozen-lockfile
       - run: yarn tsc
-      - run: yarn build
-      - name: verify app and plugin creation
-        run: node ${{ github.workspace }}/packages/cli/e2e-test/cli-e2e-test.js
+      - name: yarn build
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+      - name: run E2E test
+        run: yarn workspace e2e-test start
diff --git a/.github/workflows/cli.yml b/.github/workflows/e2e.yml
similarity index 87%
rename from .github/workflows/cli.yml
rename to .github/workflows/e2e.yml
index 158310b5ea..45b9d7e2d8 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/e2e.yml
@@ -1,11 +1,10 @@
-name: CLI Test
+name: E2E Test Linux
 
 on:
   pull_request:
     paths-ignore:
       - 'microsite/**'
 
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -51,13 +50,14 @@ jobs:
       - name: yarn install
         run: yarn install --frozen-lockfile
       - run: yarn tsc
-      - run: yarn build
-      - name: verify app and plugin creation
+      - name: yarn build
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+      - name: run E2E test
+        run: |
+          sudo sysctl fs.inotify.max_user_watches=524288
+          yarn workspace e2e-test start
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-        run: |
-          sudo sysctl fs.inotify.max_user_watches=524288
-          node ${{ github.workspace }}/packages/cli/e2e-test/cli-e2e-test.js