reduce load tests, fix purge creation time (#1511)

## Description

Removes the individual user load test set to
focus on backup-restore of the standard org.
Fixes the folder-creation time value provided to
the purge script from load tests.

## Type of change

- [x] 🐛 Bugfix
- [x] 🤖 Test

## Issue(s)

* #902

## Test Plan

- [x] 💚 E2E
This commit is contained in:
Keepers 2022-11-15 18:00:30 -07:00 committed by GitHub
parent caf8422558
commit a6853addd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions

View File

@ -3,8 +3,8 @@ on:
schedule: schedule:
# every day at 01:59 (01:59am) UTC # every day at 01:59 (01:59am) UTC
# - cron: "59 1 * * *" # - cron: "59 1 * * *"
# temp, for testing: every 6 hours # temp, for testing: every 4 hours
- cron: "0 */6 * * *" - cron: "0 */4 * * *"
permissions: permissions:
# required to retrieve AWS credentials # required to retrieve AWS credentials
@ -18,7 +18,7 @@ concurrency:
jobs: jobs:
Load-Tests: Load-Tests:
environment: Testing environment: Load Testing
runs-on: ubuntu-latest runs-on: ubuntu-latest
defaults: defaults:
run: run:
@ -55,10 +55,10 @@ jobs:
# run the tests # run the tests
- name: Integration Tests - name: Integration Tests
env: env:
AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
CORSO_PASSPHRASE: ${{ secrets.INTEGRATION_TEST_CORSO_PASSPHRASE }} CORSO_PASSPHRASE: ${{ secrets.CORSO_PASSPHRASE }}
CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }} CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }}
CORSO_M365_LOAD_TEST_ORG_USERS: ${{ secrets.CORSO_M365_LOAD_TEST_ORG_USERS }} CORSO_M365_LOAD_TEST_ORG_USERS: ${{ secrets.CORSO_M365_LOAD_TEST_ORG_USERS }}
CORSO_LOAD_TESTS: true CORSO_LOAD_TESTS: true
@ -83,9 +83,9 @@ jobs:
- name: New Data Creation - name: New Data Creation
working-directory: ./src/cmd/factory working-directory: ./src/cmd/factory
env: env:
AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }} CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }}
run: | run: |
go run . exchange emails \ go run . exchange emails \
@ -116,7 +116,7 @@ jobs:
retention-days: 14 retention-days: 14
setup: setup:
environment: Testing environment: Load Testing
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
matrix: ${{ steps.build.outputs.matrix }} matrix: ${{ steps.build.outputs.matrix }}
@ -135,7 +135,7 @@ jobs:
purge-load-test-user-data: purge-load-test-user-data:
needs: [setup, Load-Tests] needs: [setup, Load-Tests]
if: always() if: always()
environment: Testing environment: Load Testing
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
@ -145,13 +145,13 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set folder boundary datetime - name: Set folder boundary datetime
run: | run: |
echo "NOW=$(date -u +"%Y-%m-%d_%H-%M-%S")" >> $GITHUB_ENV echo "NOW=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> $GITHUB_ENV
- name: Purge Load-Test-Produced Folders - name: Purge Load-Test-Produced Folders
uses: ./.github/actions/purge-m365-user-data uses: ./.github/actions/purge-m365-user-data
with: with:
older-than: ${{ env.NOW }} older-than: ${{ env.NOW }}
folder-prefix: ${{ matrix.folder }} folder-prefix: ${{ matrix.folder }}
azure-client-id: ${{ secrets.CLIENT_ID }} azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
azure-client-secret: ${{ secrets.CLIENT_SECRET }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
azure-tenant-id: ${{ secrets.TENANT_ID }} azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
user: ${{ matrix.user }} user: ${{ matrix.user }}

View File

@ -425,6 +425,7 @@ func TestRepositoryIndividualLoadTestExchangeSuite(t *testing.T) {
func (suite *RepositoryIndividualLoadTestExchangeSuite) SetupSuite() { func (suite *RepositoryIndividualLoadTestExchangeSuite) SetupSuite() {
t := suite.T() t := suite.T()
t.Skip("individual user exchange suite tests are on hold until token expiry gets resolved")
t.Parallel() t.Parallel()
suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t)
suite.usersUnderTest = singleUserSet(t) suite.usersUnderTest = singleUserSet(t)
@ -477,7 +478,7 @@ func TestRepositoryLoadTestOneDriveSuite(t *testing.T) {
func (suite *RepositoryLoadTestOneDriveSuite) SetupSuite() { func (suite *RepositoryLoadTestOneDriveSuite) SetupSuite() {
t := suite.T() t := suite.T()
t.Skip("temp issue-902-live") t.Skip("not running onedrive load tests atm")
t.Parallel() t.Parallel()
suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t)
suite.usersUnderTest = orgUserSet(t) suite.usersUnderTest = orgUserSet(t)
@ -524,7 +525,7 @@ func TestRepositoryIndividualLoadTestOneDriveSuite(t *testing.T) {
func (suite *RepositoryIndividualLoadTestOneDriveSuite) SetupSuite() { func (suite *RepositoryIndividualLoadTestOneDriveSuite) SetupSuite() {
t := suite.T() t := suite.T()
t.Skip("temp issue-902-live") t.Skip("not running onedrive load tests atm")
t.Parallel() t.Parallel()
suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t)
suite.usersUnderTest = singleUserSet(t) suite.usersUnderTest = singleUserSet(t)