Choose test Account using round robin (#3287)
<!-- PR description--> Use Round Robin to choose account for testing to avoid conflicts. #### 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 - [x] 🤖 Supportability/Tests - [ ] 💻 CI/Deployment - [ ] 🧹 Tech Debt/Cleanup #### Issue(s) <!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. --> * #<issue> #### Test Plan <!-- How will this be tested prior to merging.--> - [ ] 💪 Manual - [ ] ⚡ Unit test - [x] 💚 E2E
This commit is contained in:
parent
abaa51f122
commit
7b83626adb
2
.github/workflows/accSelector.yaml
vendored
2
.github/workflows/accSelector.yaml
vendored
@ -43,4 +43,4 @@ jobs:
|
|||||||
echo "CLIENT_ID_ENV=CLIENT_ID_4" >> $GITHUB_OUTPUT
|
echo "CLIENT_ID_ENV=CLIENT_ID_4" >> $GITHUB_OUTPUT
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_4" >> $GITHUB_OUTPUT
|
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_4" >> $GITHUB_OUTPUT
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
33
.github/workflows/ci.yml
vendored
33
.github/workflows/ci.yml
vendored
@ -52,38 +52,7 @@ jobs:
|
|||||||
|
|
||||||
# SetM365App will decide which M365 app to use for this CI run
|
# SetM365App will decide which M365 app to use for this CI run
|
||||||
SetM365App:
|
SetM365App:
|
||||||
environment: Testing
|
uses: alcionai/corso/.github/workflows/accSelector.yaml@main
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
client_app_slot: ${{ steps.roundrobin.outputs.CLIENT_APP_SLOT }}
|
|
||||||
client_id_env: ${{ steps.roundrobin.outputs.CLIENT_ID_ENV }}
|
|
||||||
client_secret_env: ${{ steps.roundrobin.outputs.CLIENT_SECRET_ENV }}
|
|
||||||
steps:
|
|
||||||
- name: Figure out which client id to use
|
|
||||||
id: roundrobin
|
|
||||||
run: |
|
|
||||||
slot=$((GITHUB_RUN_NUMBER % 4))
|
|
||||||
echo "CLIENT_APP_SLOT=$slot" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
case $slot in
|
|
||||||
|
|
||||||
0)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
1)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_2" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_2" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_3" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_3" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_4" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_4" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
SetEnv:
|
SetEnv:
|
||||||
environment: Testing
|
environment: Testing
|
||||||
|
|||||||
33
.github/workflows/nightly_test.yml
vendored
33
.github/workflows/nightly_test.yml
vendored
@ -41,38 +41,7 @@ jobs:
|
|||||||
|
|
||||||
# SetM365App will decide which M365 app to use for this CI run
|
# SetM365App will decide which M365 app to use for this CI run
|
||||||
SetM365App:
|
SetM365App:
|
||||||
environment: Testing
|
uses: alcionai/corso/.github/workflows/accSelector.yaml@main
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
client_app_slot: ${{ steps.roundrobin.outputs.CLIENT_APP_SLOT }}
|
|
||||||
client_id_env: ${{ steps.roundrobin.outputs.CLIENT_ID_ENV }}
|
|
||||||
client_secret_env: ${{ steps.roundrobin.outputs.CLIENT_SECRET_ENV }}
|
|
||||||
steps:
|
|
||||||
- name: Figure out which client id to use
|
|
||||||
id: roundrobin
|
|
||||||
run: |
|
|
||||||
slot=$((GITHUB_RUN_NUMBER % 4))
|
|
||||||
echo "CLIENT_APP_SLOT=$slot" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
case $slot in
|
|
||||||
|
|
||||||
0)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
1)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_2" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_2" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_3" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_3" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
echo "CLIENT_ID_ENV=CLIENT_ID_4" >> $GITHUB_OUTPUT
|
|
||||||
echo "CLIENT_SECRET_ENV=CLIENT_SECRET_4" >> $GITHUB_OUTPUT
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
SetEnv:
|
SetEnv:
|
||||||
environment: Testing
|
environment: Testing
|
||||||
|
|||||||
22
.github/workflows/sanity-test.yaml
vendored
22
.github/workflows/sanity-test.yaml
vendored
@ -19,14 +19,18 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
SetM365App:
|
||||||
|
uses: alcionai/corso/.github/workflows/accSelector.yaml@main
|
||||||
|
|
||||||
Sanity-Tests:
|
Sanity-Tests:
|
||||||
|
needs: [ SetM365App ]
|
||||||
environment: Testing
|
environment: Testing
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
|
||||||
AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets[needs.SetM365App.outputs.client_id_env] }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets[needs.SetM365App.outputs.client_secret_env] }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
||||||
CORSO_BUCKET: ${{ secrets.CI_TESTS_S3_BUCKET }}
|
CORSO_BUCKET: ${{ secrets.CI_TESTS_S3_BUCKET }}
|
||||||
CORSO_LOG_DIR: testlog
|
CORSO_LOG_DIR: testlog
|
||||||
@ -114,8 +118,8 @@ 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[needs.SetM365App.outputs.client_id_env] }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets[needs.SetM365App.outputs.client_secret_env] }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
||||||
run: |
|
run: |
|
||||||
go run . exchange emails \
|
go run . exchange emails \
|
||||||
@ -257,8 +261,8 @@ jobs:
|
|||||||
id: new-data-creation-onedrive
|
id: new-data-creation-onedrive
|
||||||
working-directory: ./src/cmd/factory
|
working-directory: ./src/cmd/factory
|
||||||
env:
|
env:
|
||||||
AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets[needs.SetM365App.outputs.client_id_env] }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets[needs.SetM365App.outputs.client_secret_env] }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
||||||
run: |
|
run: |
|
||||||
suffix=`date +"%Y-%m-%d_%H-%M"`
|
suffix=`date +"%Y-%m-%d_%H-%M"`
|
||||||
@ -355,8 +359,8 @@ jobs:
|
|||||||
- name: New Data Creation for Incremental OneDrive
|
- name: New Data Creation for Incremental OneDrive
|
||||||
working-directory: ./src/cmd/factory
|
working-directory: ./src/cmd/factory
|
||||||
env:
|
env:
|
||||||
AZURE_CLIENT_ID: ${{ secrets.CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets[needs.SetM365App.outputs.client_id_env] }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets[needs.SetM365App.outputs.client_secret_env] }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.TENANT_ID }}
|
||||||
run: |
|
run: |
|
||||||
go run . onedrive files \
|
go run . onedrive files \
|
||||||
@ -573,7 +577,7 @@ jobs:
|
|||||||
echo SHA=${GITHUB_REF#refs/heads/}-${GITHUB_SHA} >> $GITHUB_OUTPUT
|
echo SHA=${GITHUB_REF#refs/heads/}-${GITHUB_SHA} >> $GITHUB_OUTPUT
|
||||||
echo RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} >> $GITHUB_OUTPUT
|
echo RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} >> $GITHUB_OUTPUT
|
||||||
echo COMMIT_URL=${{ github.server_url }}/${{ github.repository }}/commit/${GITHUB_SHA} >> $GITHUB_OUTPUT
|
echo COMMIT_URL=${{ github.server_url }}/${{ github.repository }}/commit/${GITHUB_SHA} >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Send Github Action failure to Slack
|
- name: Send Github Action failure to Slack
|
||||||
id: slack-notification
|
id: slack-notification
|
||||||
if: failure()
|
if: failure()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user