Distinguish CI output between Exchange and OneDrive (#2885)
The CI output between Exchange and Onedrive is easily distinguished when calling multiple scripts from the same action step. Use separate steps for clarity. Also removes now unnecessary Go setup step --- #### Does this PR need a docs update or release note? - [ ] ✅ Yes, it's included - [ ] 🕐 Yes, but in a later PR - [x] ⛔ No #### Type of change <!--- Please check the type of change your PR introduces: ---> - [ ] 🌻 Feature - [ ] 🐛 Bugfix - [ ] 🗺️ Documentation - [ ] 🤖 Supportability/Tests - [x] 💻 CI/Deployment - [ ] 🧹 Tech Debt/Cleanup #### Issue(s) #### Test Plan <!-- How will this be tested prior to merging.--> - [x] 💪 Manual - [ ] ⚡ Unit test - [ ] 💚 E2E
This commit is contained in:
parent
c49e4bbef4
commit
7b26a7213a
11
.github/actions/purge-m365-user-data/action.yml
vendored
11
.github/actions/purge-m365-user-data/action.yml
vendored
@ -36,7 +36,7 @@ inputs:
|
|||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
steps:
|
steps:
|
||||||
- name: Run the all Exchange amd OneDrive purge scripts for user
|
- name: Run the Exchange purge scripts for user
|
||||||
if: ${{ inputs.user != '' }}
|
if: ${{ inputs.user != '' }}
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
working-directory: ./src/cmd/purge/scripts
|
working-directory: ./src/cmd/purge/scripts
|
||||||
@ -44,10 +44,17 @@ runs:
|
|||||||
AZURE_CLIENT_ID: ${{ inputs.azure-client-id }}
|
AZURE_CLIENT_ID: ${{ inputs.azure-client-id }}
|
||||||
AZURE_CLIENT_SECRET: ${{ inputs.azure-client-secret }}
|
AZURE_CLIENT_SECRET: ${{ inputs.azure-client-secret }}
|
||||||
AZURE_TENANT_ID: ${{ inputs.azure-tenant-id }}
|
AZURE_TENANT_ID: ${{ inputs.azure-tenant-id }}
|
||||||
|
run: |
|
||||||
|
./exchangePurge.ps1 -User ${{ inputs.user }} -FolderNamePurgeList PersonMetadata -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -PurgeBeforeTimestamp ${{ inputs.older-than }}
|
||||||
|
|
||||||
|
- name: Run the OneDrive purge scripts for user
|
||||||
|
if: ${{ inputs.user != '' }}
|
||||||
|
shell: pwsh
|
||||||
|
working-directory: ./src/cmd/purge/scripts
|
||||||
|
env:
|
||||||
M365_TENANT_ADMIN_USER: ${{ inputs.m365-admin-user }}
|
M365_TENANT_ADMIN_USER: ${{ inputs.m365-admin-user }}
|
||||||
M365_TENANT_ADMIN_PASSWORD: ${{ inputs.m365-admin-password }}
|
M365_TENANT_ADMIN_PASSWORD: ${{ inputs.m365-admin-password }}
|
||||||
run: |
|
run: |
|
||||||
./exchangePurge.ps1 -User ${{ inputs.user }} -FolderNamePurgeList PersonMetadata -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -PurgeBeforeTimestamp ${{ inputs.older-than }}
|
|
||||||
./onedrivePurge.ps1 -User ${{ inputs.user }} -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -PurgeBeforeTimestamp ${{ inputs.older-than }}
|
./onedrivePurge.ps1 -User ${{ inputs.user }} -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -PurgeBeforeTimestamp ${{ inputs.older-than }}
|
||||||
|
|
||||||
- name: Run SharePoint purge script
|
- name: Run SharePoint purge script
|
||||||
|
|||||||
3
.github/workflows/ci_test_cleanup.yml
vendored
3
.github/workflows/ci_test_cleanup.yml
vendored
@ -15,9 +15,6 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-go@v3
|
|
||||||
with:
|
|
||||||
go-version: '1.19'
|
|
||||||
|
|
||||||
# sets the maximum time to now-30m.
|
# sets the maximum time to now-30m.
|
||||||
# CI test have a 10 minute timeout.
|
# CI test have a 10 minute timeout.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user