From 7e376e71e7e22d9929535490dbe3e533fe36d505 Mon Sep 17 00:00:00 2001
From: Peter Makowski <me+git@petermakowski.io>
Date: Mon, 22 Jan 2024 13:34:09 +0100
Subject: [PATCH] add MAAS_UI_URL env variable

---
 .github/workflows/cypress.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 67e20346dad..719e99bd728 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       MAAS_URL: http://localhost:5240
+      MAAS_UI_URL: http://localhost:8400
     steps:
       - uses: actions/checkout@main
       - name: Get branch name
@@ -28,11 +29,11 @@ jobs:
       - name: Run Cypress tests without a user
         uses: cypress-io/github-action@v4
         with:
-          config: baseUrl="http://localhost:8400/",pageLoadTimeout=100000
+          config: baseUrl=${{env.MAAS_UI_URL}},pageLoadTimeout=100000
           install: false
           start: yarn start
           spec: "cypress/e2e/no-users/**/*.spec.ts"
-          wait-on: "http://localhost:8400/MAAS/r/machines"
+          wait-on: "${{env.MAAS_UI_URL}}/MAAS/r/machines"
       - name: Create MAAS admin
         run: sudo maas createadmin --username=admin --password=test --email=fake@example.org
       - name: Create MAAS non-admin user
@@ -45,10 +46,10 @@ jobs:
       - name: Run Cypress tests with a user
         uses: cypress-io/github-action@v4
         with:
-          config: baseUrl=${{env.MAAS_URL}},pageLoadTimeout=100000
+          config: baseUrl=${{env.MAAS_UI_URL}},pageLoadTimeout=100000
           install: false
           spec: "cypress/e2e/with-users/**/*.spec.ts"
-          wait-on: "${{env.MAAS_URL}}/MAAS/r/machines"
+          wait-on: "${{env.MAAS_UI_URL}}/MAAS/r/machines"
       - uses: actions/upload-artifact@v4
         if: failure()
         with: