chore: test keycloak 24

Author: tobybellwood

.github/workflows/ui-workflow.yaml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - cypress-test
+      - testing/**
 
 jobs:
   format-check:

Makefile

@@ -1,7 +1,7 @@
 # upstream
 CI_BUILD_TAG ?= lagoon-ui
 CORE_REPO=https://github.com/uselagoon/lagoon.git
-CORE_TREEISH=keycloak-26
+CORE_TREEISH=main
 CYPRESS_BASE=cypress/base:20.13.1
 
 LAGOON_CORE_IMAGE_REPO=testlagoon
@@ -82,4 +82,4 @@ local-dev-yarn:
 .PHONY: local-dev-yarn-stop
 local-dev-yarn-stop:
 	docker stop local-dev-yarn || true
-	docker rm local-dev-yarn || true
+	docker rm local-dev-yarn || true