From 6a43a52a397e6a045a6d5912834d137cce319fc3 Mon Sep 17 00:00:00 2001
From: Asier Isayas <aisayas@microsoft.com>
Date: Tue, 6 Jan 2026 12:01:12 -0500
Subject: [PATCH] copy cleanup accounts

---
 .github/workflows/ci.yml           | 27 +++++++++++++++++++--------
 .github/workflows/cleanup-base.yml | 29 -----------------------------
 .github/workflows/cleanup.yml      | 22 ++++++++++++++++++++--
 3 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/cleanup-base.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b47beecc7..8ace3f177 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,11 +12,6 @@ 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"
@@ -259,6 +254,22 @@ jobs:
 
   cleanupaccounts:
     name: "Cleanup Test Database Accounts"
-    needs: [playwright-tests]
-    if: ${{ !cancelled() }}
-    uses: ./.github/workflows/cleanup-base.yml
+    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
diff --git a/.github/workflows/cleanup-base.yml b/.github/workflows/cleanup-base.yml
deleted file mode 100644
index 59d91eaaa..000000000
--- a/.github/workflows/cleanup-base.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-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
\ No newline at end of file
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 5456f6645..6eed6ca0b 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -17,5 +17,23 @@ permissions:
 jobs:
   # This workflow contains a single job called "build"
   cleanupaccounts:
-      name: "Cleanup Test Database Accounts"
-      uses: ./.github/workflows/cleanup-base.yml
+    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