From a6853addd1692a259db2dd1d7ac9da90458c7ab8 Mon Sep 17 00:00:00 2001 From: Keepers Date: Tue, 15 Nov 2022 18:00:30 -0700 Subject: [PATCH] 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] :bug: Bugfix - [x] :robot: Test ## Issue(s) * #902 ## Test Plan - [x] :green_heart: E2E --- .github/workflows/load_test.yml | 32 +++++++++++----------- src/pkg/repository/repository_load_test.go | 5 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/load_test.yml b/.github/workflows/load_test.yml index f7bffe014..df1cc8f49 100644 --- a/.github/workflows/load_test.yml +++ b/.github/workflows/load_test.yml @@ -3,8 +3,8 @@ on: schedule: # every day at 01:59 (01:59am) UTC # - cron: "59 1 * * *" - # temp, for testing: every 6 hours - - cron: "0 */6 * * *" + # temp, for testing: every 4 hours + - cron: "0 */4 * * *" permissions: # required to retrieve AWS credentials @@ -18,7 +18,7 @@ concurrency: jobs: Load-Tests: - environment: Testing + environment: Load Testing runs-on: ubuntu-latest defaults: run: @@ -55,10 +55,10 @@ jobs: # run the tests - name: Integration Tests env: - AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }} - AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} - CORSO_PASSPHRASE: ${{ secrets.INTEGRATION_TEST_CORSO_PASSPHRASE }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + CORSO_PASSPHRASE: ${{ secrets.CORSO_PASSPHRASE }} 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_LOAD_TESTS: true @@ -83,9 +83,9 @@ jobs: - name: New Data Creation working-directory: ./src/cmd/factory env: - AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }} - AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }} run: | go run . exchange emails \ @@ -116,7 +116,7 @@ jobs: retention-days: 14 setup: - environment: Testing + environment: Load Testing runs-on: ubuntu-latest outputs: matrix: ${{ steps.build.outputs.matrix }} @@ -135,7 +135,7 @@ jobs: purge-load-test-user-data: needs: [setup, Load-Tests] if: always() - environment: Testing + environment: Load Testing runs-on: ubuntu-latest strategy: matrix: @@ -145,13 +145,13 @@ jobs: - uses: actions/checkout@v3 - name: Set folder boundary datetime 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 uses: ./.github/actions/purge-m365-user-data with: older-than: ${{ env.NOW }} folder-prefix: ${{ matrix.folder }} - azure-client-id: ${{ secrets.CLIENT_ID }} - azure-client-secret: ${{ secrets.CLIENT_SECRET }} - azure-tenant-id: ${{ secrets.TENANT_ID }} + azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} + azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} + azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} user: ${{ matrix.user }} diff --git a/src/pkg/repository/repository_load_test.go b/src/pkg/repository/repository_load_test.go index 629d6049e..2077a5af6 100644 --- a/src/pkg/repository/repository_load_test.go +++ b/src/pkg/repository/repository_load_test.go @@ -425,6 +425,7 @@ func TestRepositoryIndividualLoadTestExchangeSuite(t *testing.T) { func (suite *RepositoryIndividualLoadTestExchangeSuite) SetupSuite() { t := suite.T() + t.Skip("individual user exchange suite tests are on hold until token expiry gets resolved") t.Parallel() suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.usersUnderTest = singleUserSet(t) @@ -477,7 +478,7 @@ func TestRepositoryLoadTestOneDriveSuite(t *testing.T) { func (suite *RepositoryLoadTestOneDriveSuite) SetupSuite() { t := suite.T() - t.Skip("temp issue-902-live") + t.Skip("not running onedrive load tests atm") t.Parallel() suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.usersUnderTest = orgUserSet(t) @@ -524,7 +525,7 @@ func TestRepositoryIndividualLoadTestOneDriveSuite(t *testing.T) { func (suite *RepositoryIndividualLoadTestOneDriveSuite) SetupSuite() { t := suite.T() - t.Skip("temp issue-902-live") + t.Skip("not running onedrive load tests atm") t.Parallel() suite.ctx, suite.repo, suite.acct, suite.st = initM365Repo(t) suite.usersUnderTest = singleUserSet(t)