From f4a5f11197e19439af863c1c2732fe14f4f73a07 Mon Sep 17 00:00:00 2001
From: Gareth Bowen <gareth@medic.org>
Date: Mon, 20 Nov 2023 10:29:08 +1300
Subject: [PATCH] chore(#8708): merge side service tests into main build

---
 .github/workflows/build.yml             |  5 +++++
 .github/workflows/side-service-test.yml | 24 ------------------------
 package.json                            |  4 +++-
 3 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/side-service-test.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c2057982d8..3b11a6f4c31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,6 +24,11 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+    - name: Install bats
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y bats
+
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
diff --git a/.github/workflows/side-service-test.yml b/.github/workflows/side-service-test.yml
deleted file mode 100644
index 96c1f7cec65..00000000000
--- a/.github/workflows/side-service-test.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Test nginx and haproxy
-
-on: [push, pull_request]
-
-jobs:
-
-  test:
-    name: Run compose tests
-    runs-on: ubuntu-22.04
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Run test
-      run: |
-        sudo apt update
-        sudo apt install -y bats
-        (
-          cd nginx/tests
-          make test
-        )
-        (
-          cd haproxy/tests
-          make test
-        )
diff --git a/package.json b/package.json
index 3287f40d250..1451b67f07e 100755
--- a/package.json
+++ b/package.json
@@ -42,10 +42,12 @@
     "unit-shared-lib": "UNIT_TEST_ENV=1 npm test --workspaces --if-present",
     "unit-webapp": "UNIT_TEST_ENV=1 mocha 'webapp/tests/mocha/**/*.spec.js' && cd webapp && npm run unit -- --watch=false",
     "unit-webapp-continuous": "cd webapp && npm run unit -- --watch=true",
+    "unit-nginx": "cd nginx/tests && make test",
+    "unit-haproxy": "cd haproxy/tests && make test",
     "wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
     "-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
     "build": "./scripts/build/build-ci.sh",
-    "ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit",
+    "ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit && npm run unit-nginx && npm run unit-haproxy",
     "ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
     "ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
     "ci-webdriver-default": "wdio run ./tests/e2e/default/wdio.conf.js",