From 7778cff03152cf1ee721da1aac51ca335b262024 Mon Sep 17 00:00:00 2001
From: Dan Garner <dan@xibosignage.com>
Date: Mon, 4 Mar 2024 17:10:13 +0000
Subject: [PATCH] QA: build the manual test container using the Dockerfile.ci
 (#2412)

---
 .github/workflows/build-pr.yaml   |  1 +
 .github/workflows/test-suite.yaml | 20 +++-----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-pr.yaml b/.github/workflows/build-pr.yaml
index ec46b5d502..e5081eaf4b 100644
--- a/.github/workflows/build-pr.yaml
+++ b/.github/workflows/build-pr.yaml
@@ -33,6 +33,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: Dockerfile.ci
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: ghcr.io/xibosignage/xibo-cms:test-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
index 137a14fad3..844723bd23 100644
--- a/.github/workflows/test-suite.yaml
+++ b/.github/workflows/test-suite.yaml
@@ -67,27 +67,13 @@ jobs:
         run: |
           docker pull mysql:8
           docker pull ghcr.io/xibosignage/xibo-xmr:latest
-
-      - name: Configure Build X
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfile.ci
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: cms-web
-          build-args: GIT_COMMIT=${{ github.sha }}
-          push: false
-          load: true
+          docker pull ghcr.io/xibosignage/xibo-cms:test-${{ github.event.issue.number }}
 
       - name: Run
         run: |
           docker run --name cms-db -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=cms -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -d mysql:8
           docker run --name cms-xmr -d ghcr.io/xibosignage/xibo-xmr:latest
-          docker run --name cms-web -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -e CMS_DEV_MODE=true -e XMR_HOST=cms-xmr --link cms-db:db --link cms-xmr:50001 -d cms-web
+          docker run --name cms-web -e MYSQL_HOST=cms-db -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -e CMS_DEV_MODE=true -e XMR_HOST=cms-xmr -e CMS_USAGE_REPORT=false -e INSTALL_TYPE=ci -e MYSQL_BACKUP_ENABLED=false --link cms-db --link cms-xmr -d ghcr.io/xibosignage/xibo-cms:test-${{ github.event.issue.number }}
 
       - name: Wait for CMS
         run: |
@@ -106,7 +92,7 @@ jobs:
 
       - name: Run PHP Unit
         run: |
-          docker exec --user www-data -t cms-web /bin/bash -c "cd /var/www/cms; curl https://phar.phpunit.de/phpunit-10.0.phar -o vendor/bin/phpunit && chmod +x vendor/bin/phpunit && php vendor/bin/phpunit --log-junit results.xml"
+          docker exec --user www-data -t cms-web /bin/bash -c "cd /var/www/cms; php vendor/bin/phpunit --log-junit results.xml"
 
       - name: Run Cypress
         id: cypress