From a35c4688057daa7b023a87680497a291cc2d60f6 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 15 Jan 2024 10:20:25 +0200 Subject: [PATCH 1/5] fix integration-tests-v2 workflow file --- .github/workflows/integration-tests-v2.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests-v2.yaml b/.github/workflows/integration-tests-v2.yaml index 5d7f9cd0..36580b9a 100644 --- a/.github/workflows/integration-tests-v2.yaml +++ b/.github/workflows/integration-tests-v2.yaml @@ -13,13 +13,9 @@ on: workflow_call: inputs: environment: - description: 'Environment to run the tests against' - type: choice - required: true default: 'staging' - options: - - dev - - staging + required: false + type: string secrets: FIREBOLT_CLIENT_ID_STG_NEW_IDN: required: true From 94a22b565993dad6fafa9e7b58c289c9c3fe9338 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 15 Jan 2024 10:23:09 +0200 Subject: [PATCH 2/5] fix typo --- .github/workflows/integration-tests-v2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests-v2.yaml b/.github/workflows/integration-tests-v2.yaml index 36580b9a..d07b6913 100644 --- a/.github/workflows/integration-tests-v2.yaml +++ b/.github/workflows/integration-tests-v2.yaml @@ -66,7 +66,7 @@ jobs: FIREBOLT_DATABASE: ${{ steps.setup.outputs.database_name }} FIREBOLT_ENGINE_NAME: ${{ steps.setup.outputs.engine_name }} FIREBOLT_API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io" - FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID + FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID }} FIREBOLT_CLIENT_SECRET: ${{ env.CLIENT_SECRET }} run: | npm run test:ci integration \ No newline at end of file From e733695553763902eea1cf2214df6cedf1cfb367 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 15 Jan 2024 10:33:34 +0200 Subject: [PATCH 3/5] update test actions to run specific tests --- .github/workflows/integration-tests-v1.yaml | 2 +- .github/workflows/integration-tests-v2.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests-v1.yaml b/.github/workflows/integration-tests-v1.yaml index 26bc82b3..46abaadf 100644 --- a/.github/workflows/integration-tests-v1.yaml +++ b/.github/workflows/integration-tests-v1.yaml @@ -82,4 +82,4 @@ jobs: FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID }} FIREBOLT_CLIENT_SECRET: ${{ env.CLIENT_SECRET }} run: | - npm run test:ci integration \ No newline at end of file + npm run test:ci integration/v1 \ No newline at end of file diff --git a/.github/workflows/integration-tests-v2.yaml b/.github/workflows/integration-tests-v2.yaml index d07b6913..14e60456 100644 --- a/.github/workflows/integration-tests-v2.yaml +++ b/.github/workflows/integration-tests-v2.yaml @@ -46,8 +46,8 @@ jobs: 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" + echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_DEV_NEW_IDN }}" >> "$GITHUB_ENV" + echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_DEV_NEW_IDN }}" >> "$GITHUB_ENV" fi - name: Setup database and engine @@ -69,4 +69,4 @@ jobs: FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID }} FIREBOLT_CLIENT_SECRET: ${{ env.CLIENT_SECRET }} run: | - npm run test:ci integration \ No newline at end of file + npm run test:ci integration/v2 \ No newline at end of file From af92f40b5b18124f76891cf5c94dc46302d2d717 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 15 Jan 2024 10:44:58 +0200 Subject: [PATCH 4/5] increate engine test timeout --- test/integration/v2/engine.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/integration/v2/engine.test.ts b/test/integration/v2/engine.test.ts index c65b8bb9..7b407ffd 100644 --- a/test/integration/v2/engine.test.ts +++ b/test/integration/v2/engine.test.ts @@ -1,4 +1,8 @@ -import { EngineStatusSummary, Firebolt, FireboltResourceManager } from "../../../src/index"; +import { + EngineStatusSummary, + Firebolt, + FireboltResourceManager +} from "../../../src/index"; import { EngineType, WarmupMethod } from "../../../src/service/engine/types"; const authOptions = { @@ -12,7 +16,7 @@ const connectionOptions = { database: process.env.FIREBOLT_DATABASE as string }; -jest.setTimeout(20000); +jest.setTimeout(60000); describe("engine integration", () => { it.skip( From 453ca1ab335a7994bd395002db76feb263c3e5bd Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 15 Jan 2024 10:54:23 +0200 Subject: [PATCH 5/5] fix test files path --- .github/workflows/integration-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 5348ae82..975bc0a3 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -44,7 +44,7 @@ on: required: true jobs: integration-test-v1: - uses: ./.github/workflows/integration-tests-v1.yml + uses: ./.github/workflows/integration-tests-v1.yaml with: environment: ${{ inputs.environment }} secrets: @@ -57,7 +57,7 @@ jobs: SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }} SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }} integration-test-v2: - uses: ./.github/workflows/integration-tests-v2.yml + uses: ./.github/workflows/integration-tests-v2.yaml with: environment: ${{ inputs.environment }} secrets: