refactor and run cleanup during pr check

.github/workflows/ci.yml

@@ -12,6 +12,11 @@ permissions:
   id-token: write
   contents: read
 jobs:
+  cleanupaccounts:
+    name: "Cleanup Test Database Accounts"
+    needs: [playwright-tests]
+    if: ${{ !cancelled() }}
+    uses: ./.github/workflows/cleanup-base.yml
   codemetrics:
     runs-on: ubuntu-latest
     name: "Log Code Metrics"
@@ -251,3 +256,9 @@ jobs:
           name: html-report--attempt-${{ github.run_attempt }}
           path: playwright-report
           retention-days: 14
+
+  cleanupaccounts:
+    name: "Cleanup Test Database Accounts"
+    needs: [playwright-tests]
+    if: ${{ !cancelled() }}
+    uses: ./.github/workflows/cleanup-base.yml

.github/workflows/cleanup-base.yml

@@ -0,0 +1,29 @@
+name: Cleanup Accounts
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  cleanupaccounts:
+    name: "Cleanup Test Database Accounts"
+    runs-on: ubuntu-latest
+    env:
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Az CLI login"
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.E2E_TESTS_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+
+      - run: npm ci
+      - run: node utils/cleanupDBs.js

.github/workflows/cleanup.yml

@@ -17,23 +17,5 @@ permissions:
 jobs:
   # This workflow contains a single job called "build"
   cleanupaccounts:
-    name: "Cleanup Test Database Accounts"
-    runs-on: ubuntu-latest
-    env:
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: "Az CLI login"
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.E2E_TESTS_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 18.x
-      - run: npm ci
-      - run: node utils/cleanupDBs.js
+      name: "Cleanup Test Database Accounts"
+      uses: ./.github/workflows/cleanup-base.yml