From ba1227f7afc4c8076bf009f3bdd51973cbe0d482 Mon Sep 17 00:00:00 2001
From: tpluscode <tpluscode@users.noreply.github.com>
Date: Thu, 17 Sep 2020 16:57:40 +0200
Subject: [PATCH] ci: use a healthcheck route

---
 .github/workflows/ci.yaml | 17 ++++++-----------
 apis/core/index.ts        |  1 +
 docker-compose.posix.yml  |  3 ---
 docker-compose.yml        |  6 ------
 e2e-tests/start-lando.sh  |  2 +-
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 424d7bd59..0576a2190 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,24 +13,19 @@ jobs:
       - run: yarn install --ci
       - run: yarn lint
 
-  analyse:
-    runs-on: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-      - name: Install lando
-        run: sh e2e-tests/install-lando.sh
-      - name: Start site
-        run: sh e2e-tests/start-lando.sh
-      - run: docker-compose -f docker-compose.yml -f docker-compose.posix.yml run analyser
-
   e2e-tests:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
+        with:
+          node-version: 13
+      - run: yarn install --ci
       - name: Install lando
         run: sh e2e-tests/install-lando.sh
       - name: Start site
         run: sh e2e-tests/start-lando.sh
       - run: docker-compose -f docker-compose.yml -f docker-compose.posix.yml run e2e-tests
+      - name: logs on fail
+        if: ${{ failure() }}
+        run: lando logs -s core
diff --git a/apis/core/index.ts b/apis/core/index.ts
index 7801ad602..78ecac895 100644
--- a/apis/core/index.ts
+++ b/apis/core/index.ts
@@ -19,6 +19,7 @@ async function main() {
   app.enable('trust proxy')
 
   app.get('/env-config.js', uiConfig)
+  app.get('/ping', (req, res) => res.status(204).end())
 
   app.use(await authentication())
   await hydraBox(app, {
diff --git a/docker-compose.posix.yml b/docker-compose.posix.yml
index fad6855b0..e95c0fcb5 100644
--- a/docker-compose.posix.yml
+++ b/docker-compose.posix.yml
@@ -1,8 +1,5 @@
 version: "3"
 services:
-  analyser:
-    volumes:
-      - ~/.lando/certs/lndo.site.crt:/lndo.site.crt
   e2e-tests:
     volumes:
       - ~/.lando/certs/lndo.site.crt:/lndo.site.crt
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d318e0e6..5b807da53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,5 @@
 version: "3"
 services:
-  analyser:
-    image: "hydrofoil/hydra-analyser"
-    network_mode: "host"
-    environment:
-      NODE_EXTRA_CA_CERTS: "/lndo.site.crt"
-      ENTRYPOINT_URL: "https://cube-creator.lndo.site/"
   e2e-tests:
     image: hydrofoil/hypertest:0.6.4
     network_mode: "host"
diff --git a/e2e-tests/start-lando.sh b/e2e-tests/start-lando.sh
index 02e8a3990..53910f720 100644
--- a/e2e-tests/start-lando.sh
+++ b/e2e-tests/start-lando.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 lando start
-npx wait-on --timeout 30000 http://cube-creator.lndo.site
+npx wait-on --timeout 30000 https://cube-creator.lndo.site/ping