From 3660d65df6df67951e8cbb203de3a5b6e81c3c77 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 16 Nov 2022 10:52:19 -0500
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f198579..2e9df26b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -565,6 +565,11 @@ jobs:
              export newbuilding="${newbase}-building"
              export newresource="${newbase}-resource"
              export newou="aaaGithub Actions/${newbase}"
+             # cleanup old runs
+             GAM_CSV_ROW_FILTER="name:regex:^VC-gha_test_${JID}" $gam print features | $gam csv - gam delete feature ~name
+             $gam print users query "gha.jid=$JID" | $gam csv - gam delete user ~primaryEmail
+             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}" gamd user $gam_user print shareddrives asadmin | gamd csv - gam user $gam_user delete shareddrive ~id nukefromorbit
+             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}" $gam print ous fromparent "aaaGithub Actions" | $gam csv - gam delete ou ~orgUnitId
              echo "Creating OrgUnit ${newou}"
              $gam create ou "${newou}"
              export GAM_THREADS=5
@@ -617,7 +622,6 @@ jobs:
              $gam users "$newbase-bulkuser-7 $newbase-bulkuser-8 $newbase-bulkuser-9" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit
              $gam user $newuser delete label --ALL_LABELS--
              GAM_CSV_ROW_FILTER="name:regex:gha-test-${JID}" $gam print features | $gam csv - gam delete feature ~name
-             $gam create feature name Whiteboard-$newbase
              $gam create feature name VC-$newbase
              $gam create building "My Building - $newbase" id $newbuilding floors 1,2,3,4,5,6,7,8,9,10,11,12,14,15 description "No 13th floor here..."
              $gam create resource $newresource "Resource Calendar $tstamp" capacity 25 features Whiteboard-$newbase,VC-$newbase building $newbuilding floor 15 type Room
@@ -657,7 +661,6 @@ jobs:
              #$gam delete user $newuser
              #$gam undelete user $newuser
              $gam delete user $newuser
-             $gam print users query "gha.jid=$JID" | $gam csv - gam delete user ~primaryEmail
              $gam print mobile
              $gam print devices
              $gam print browsers