From ff927a7b1432f5ab747f09bd450dff7f1c3850e0 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 17 Jul 2023 09:25:37 +0300 Subject: [PATCH 1/5] use new identity setup action for integration tests --- .github/workflows/integration-tests.yml | 2 +- .github/workflows/nightly-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index edd3ff06ed2..7bdb136b9d3 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -64,7 +64,7 @@ jobs: - name: Setup database and engine id: setup - uses: firebolt-db/integration-testing-setup@v1 + uses: firebolt-db/integration-testing-setup@v2 with: firebolt-username: ${{ env.USERNAME }} firebolt-password: ${{ env.PASSWORD }} diff --git a/.github/workflows/nightly-workflow.yml b/.github/workflows/nightly-workflow.yml index 43172e4aff8..ca3f1356eab 100644 --- a/.github/workflows/nightly-workflow.yml +++ b/.github/workflows/nightly-workflow.yml @@ -55,7 +55,7 @@ jobs: - name: Setup database and engine id: setup - uses: firebolt-db/integration-testing-setup@v1 + uses: firebolt-db/integration-testing-setup@v2 with: firebolt-username: ${{ secrets.FIREBOLT_STG_USERNAME }} firebolt-password: ${{ secrets.FIREBOLT_STG_PASSWORD }} From 13ba85079de5db51dac85962b86d2f007510d589 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 17 Jul 2023 09:38:46 +0300 Subject: [PATCH 2/5] update integration testing config --- .github/workflows/integration-tests.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7bdb136b9d3..d6671aeb6b3 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -51,39 +51,31 @@ jobs: - name: Determine env variables run: | if [ "${{ inputs.environment }}" == 'staging' ]; then - echo "USERNAME=${{ secrets.FIREBOLT_STG_USERNAME }}" >> "$GITHUB_ENV" - echo "PASSWORD=${{ secrets.FIREBOLT_STG_PASSWORD }}" >> "$GITHUB_ENV" - echo "CLIENT_ID=${{ secrets.SERVICE_ID_STG }}" >> "$GITHUB_ENV" - echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET_STG }}" >> "$GITHUB_ENV" + echo "CLIENT_ID=${{ secrets.SERVICE_ID_STG_NEW_IDN }}" >> "$GITHUB_ENV" + echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET_STG_NEW_IDN }}" >> "$GITHUB_ENV" else - echo "USERNAME=${{ secrets.FIREBOLT_USERNAME }}" >> "$GITHUB_ENV" - echo "PASSWORD=${{ secrets.FIREBOLT_PASSWORD }}" >> "$GITHUB_ENV" - echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID }}" >> "$GITHUB_ENV" - echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET }}" >> "$GITHUB_ENV" + echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}" >> "$GITHUB_ENV" + echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}" >> "$GITHUB_ENV" fi - name: Setup database and engine id: setup uses: firebolt-db/integration-testing-setup@v2 with: - firebolt-username: ${{ env.USERNAME }} - firebolt-password: ${{ env.PASSWORD }} + firebolt-client-id: ${{ env.CLIENT_ID }} + firebolt-client-secret: ${{ env.CLIENT_SECRET }} + account: "integration" api-endpoint: "api.${{ inputs.environment }}.firebolt.io" - region: "us-east-1" - name: Run integration tests env: - USER_NAME: ${{ env.USERNAME }} - PASSWORD: ${{ env.PASSWORD }} SERVICE_ID: ${{ env.CLIENT_ID }} SERVICE_SECRET: ${{ env.CLIENT_SECRET }} DATABASE_NAME: ${{ steps.setup.outputs.database_name }} ENGINE_NAME: ${{ steps.setup.outputs.engine_name }} - ENGINE_URL: ${{ steps.setup.outputs.engine_url }} STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }} - STOPPED_ENGINE_URL: ${{ steps.setup.outputs.stopped_engine_url }} API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io" - ACCOUNT_NAME: "firebolt" + ACCOUNT_NAME: "integration" run: | pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=INFO tests/integration --alluredir=allure-results From a5cc83af793bbb3cb2dc49c99ffa2e969612cd75 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 17 Jul 2023 09:47:50 +0300 Subject: [PATCH 3/5] update account name --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d6671aeb6b3..b4a2e34d9e5 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -64,7 +64,7 @@ jobs: with: firebolt-client-id: ${{ env.CLIENT_ID }} firebolt-client-secret: ${{ env.CLIENT_SECRET }} - account: "integration" + account: "developer" api-endpoint: "api.${{ inputs.environment }}.firebolt.io" - name: Run integration tests @@ -75,7 +75,7 @@ jobs: ENGINE_NAME: ${{ steps.setup.outputs.engine_name }} STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }} API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io" - ACCOUNT_NAME: "integration" + ACCOUNT_NAME: "developer" run: | pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=INFO tests/integration --alluredir=allure-results From 11fe9d4ae3cd9101284f534a997a1c3f270ec1b4 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Wed, 19 Jul 2023 17:16:34 +0300 Subject: [PATCH 4/5] update nightly workflow --- .github/workflows/integration-tests.yml | 4 ++-- .github/workflows/nightly-workflow.yml | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b4a2e34d9e5..7c20aae56c1 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -51,8 +51,8 @@ jobs: - name: Determine env variables run: | if [ "${{ inputs.environment }}" == 'staging' ]; then - echo "CLIENT_ID=${{ secrets.SERVICE_ID_STG_NEW_IDN }}" >> "$GITHUB_ENV" - echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET_STG_NEW_IDN }}" >> "$GITHUB_ENV" + echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}" >> "$GITHUB_ENV" + echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}" >> "$GITHUB_ENV" else echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}" >> "$GITHUB_ENV" echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}" >> "$GITHUB_ENV" diff --git a/.github/workflows/nightly-workflow.yml b/.github/workflows/nightly-workflow.yml index ca3f1356eab..160b9c03c42 100644 --- a/.github/workflows/nightly-workflow.yml +++ b/.github/workflows/nightly-workflow.yml @@ -57,24 +57,20 @@ jobs: id: setup uses: firebolt-db/integration-testing-setup@v2 with: - firebolt-username: ${{ secrets.FIREBOLT_STG_USERNAME }} - firebolt-password: ${{ secrets.FIREBOLT_STG_PASSWORD }} + firebolt-client-id: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }} + firebolt-client-secret: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }} api-endpoint: "api.staging.firebolt.io" - region: "us-east-1" + account: "developer" db_suffix: ${{ format('{0}_{1}', matrix.os, matrix.python-version) }} - name: Run integration tests env: - USER_NAME: ${{ secrets.FIREBOLT_STG_USERNAME }} - PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }} - SERVICE_ID: ${{ secrets.SERVICE_ID_STG }} - SERVICE_SECRET: ${{ secrets.SERVICE_SECRET_STG }} + SERVICE_ID: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }} + SERVICE_SECRET: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }} DATABASE_NAME: ${{ steps.setup.outputs.database_name }} ENGINE_NAME: ${{ steps.setup.outputs.engine_name }} - ENGINE_URL: ${{ steps.setup.outputs.engine_url }} STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }} - STOPPED_ENGINE_URL: ${{ steps.setup.outputs.stopped_engine_url }} - ACCOUNT_NAME: "firebolt" + ACCOUNT_NAME: "developer" API_ENDPOINT: "api.staging.firebolt.io" run: | pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=INFO --junit-xml=report/junit.xml tests/integration From 67100746b1b809794c07818ec6603f9a58465701 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Wed, 19 Jul 2023 17:35:46 +0300 Subject: [PATCH 5/5] update integration testing call secrets --- .github/workflows/integration-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7c20aae56c1..8e97d67e5c7 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -21,13 +21,13 @@ on: type: string description: 'Branch to run on' secrets: - FIREBOLT_USERNAME: + FIREBOLT_CLIENT_ID_STG_NEW_IDN: required: true - FIREBOLT_PASSWORD: + FIREBOLT_CLIENT_SECRET_STG_NEW_IDN: required: true - SERVICE_ID: + FIREBOLT_CLIENT_ID_NEW_IDN: required: true - SERVICE_SECRET: + FIREBOLT_CLIENT_SECRET_NEW_IDN: required: true jobs: tests: