Skip to content

Commit cb872d5

Browse files
ci: fix integration-tests-v2 workflow file (#68)
1 parent dc098d4 commit cb872d5

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/integration-tests-v1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ jobs:
8282
FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID }}
8383
FIREBOLT_CLIENT_SECRET: ${{ env.CLIENT_SECRET }}
8484
run: |
85-
npm run test:ci integration
85+
npm run test:ci integration/v1

.github/workflows/integration-tests-v2.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ on:
1313
workflow_call:
1414
inputs:
1515
environment:
16-
description: 'Environment to run the tests against'
17-
type: choice
18-
required: true
1916
default: 'staging'
20-
options:
21-
- dev
22-
- staging
17+
required: false
18+
type: string
2319
secrets:
2420
FIREBOLT_CLIENT_ID_STG_NEW_IDN:
2521
required: true
@@ -50,8 +46,8 @@ jobs:
5046
echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}" >> "$GITHUB_ENV"
5147
echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}" >> "$GITHUB_ENV"
5248
else
53-
echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}" >> "$GITHUB_ENV"
54-
echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}" >> "$GITHUB_ENV"
49+
echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_DEV_NEW_IDN }}" >> "$GITHUB_ENV"
50+
echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_DEV_NEW_IDN }}" >> "$GITHUB_ENV"
5551
fi
5652
5753
- name: Setup database and engine
@@ -70,7 +66,7 @@ jobs:
7066
FIREBOLT_DATABASE: ${{ steps.setup.outputs.database_name }}
7167
FIREBOLT_ENGINE_NAME: ${{ steps.setup.outputs.engine_name }}
7268
FIREBOLT_API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io"
73-
FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID
69+
FIREBOLT_CLIENT_ID: ${{ env.CLIENT_ID }}
7470
FIREBOLT_CLIENT_SECRET: ${{ env.CLIENT_SECRET }}
7571
run: |
76-
npm run test:ci integration
72+
npm run test:ci integration/v2

.github/workflows/integration-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444
required: true
4545
jobs:
4646
integration-test-v1:
47-
uses: ./.github/workflows/integration-tests-v1.yml
47+
uses: ./.github/workflows/integration-tests-v1.yaml
4848
with:
4949
environment: ${{ inputs.environment }}
5050
secrets:
@@ -57,7 +57,7 @@ jobs:
5757
SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }}
5858
SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }}
5959
integration-test-v2:
60-
uses: ./.github/workflows/integration-tests-v2.yml
60+
uses: ./.github/workflows/integration-tests-v2.yaml
6161
with:
6262
environment: ${{ inputs.environment }}
6363
secrets:

test/integration/v2/engine.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { EngineStatusSummary, Firebolt, FireboltResourceManager } from "../../../src/index";
1+
import {
2+
EngineStatusSummary,
3+
Firebolt,
4+
FireboltResourceManager
5+
} from "../../../src/index";
26
import { EngineType, WarmupMethod } from "../../../src/service/engine/types";
37

48
const authOptions = {
@@ -12,7 +16,7 @@ const connectionOptions = {
1216
database: process.env.FIREBOLT_DATABASE as string
1317
};
1418

15-
jest.setTimeout(20000);
19+
jest.setTimeout(60000);
1620

1721
describe("engine integration", () => {
1822
it.skip(

0 commit comments

Comments
 (0)