Skip to content

Commit 6a8c166

Browse files
stepansergeevitchstepansergeevitch
authored
ci: remove env parameter from ci (#344)
1 parent 33de2c7 commit 6a8c166

File tree

5 files changed

+22
-141
lines changed

5 files changed

+22
-141
lines changed

‎.github/workflows/integration-tests-v1.yml‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
11
name: Integration tests FB 1.0
22
on:
33
workflow_dispatch:
4-
inputs:
5-
environment:
6-
description: 'Environment to run the tests against'
7-
type: choice
8-
required: true
9-
default: 'dev'
10-
options:
11-
- dev
12-
- staging
134
workflow_call:
14-
inputs:
15-
environment:
16-
default: 'staging'
17-
required: false
18-
type: string
195
secrets:
20-
FIREBOLT_USERNAME:
21-
required: true
22-
FIREBOLT_PASSWORD:
23-
required: true
246
FIREBOLT_STG_USERNAME:
257
required: true
268
FIREBOLT_STG_PASSWORD:
279
required: true
28-
SERVICE_ID:
29-
required: true
30-
SERVICE_SECRET:
31-
required: true
3210
SERVICE_ID_STG:
3311
required: true
3412
SERVICE_SECRET_STG:
@@ -50,27 +28,13 @@ jobs:
5028
python -m pip install --upgrade pip
5129
pip install ".[dev]"
5230
53-
- name: Determine env variables
54-
run: |
55-
if [ "${{ inputs.environment }}" == 'staging' ]; then
56-
echo "USERNAME=${{ secrets.FIREBOLT_STG_USERNAME }}" >> "$GITHUB_ENV"
57-
echo "PASSWORD=${{ secrets.FIREBOLT_STG_PASSWORD }}" >> "$GITHUB_ENV"
58-
echo "CLIENT_ID=${{ secrets.SERVICE_ID_STG }}" >> "$GITHUB_ENV"
59-
echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET_STG }}" >> "$GITHUB_ENV"
60-
else
61-
echo "USERNAME=${{ secrets.FIREBOLT_USERNAME }}" >> "$GITHUB_ENV"
62-
echo "PASSWORD=${{ secrets.FIREBOLT_PASSWORD }}" >> "$GITHUB_ENV"
63-
echo "CLIENT_ID=${{ secrets.SERVICE_ID }}" >> "$GITHUB_ENV"
64-
echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET }}" >> "$GITHUB_ENV"
65-
fi
66-
6731
- name: Setup database and engine
6832
id: setup
6933
uses: firebolt-db/integration-testing-setup@v1
7034
with:
71-
firebolt-username: ${{ env.USERNAME }}
72-
firebolt-password: ${{ env.PASSWORD }}
73-
api-endpoint: "api.${{ inputs.environment }}.firebolt.io"
35+
firebolt-username: ${{ secrets.FIREBOLT_STG_USERNAME }}
36+
firebolt-password: ${{ secrets.FIREBOLT_STG_PASSWORD }}
37+
api-endpoint: "api.staging.firebolt.io"
7438
region: "us-east-1"
7539

7640
- name: Restore cached failed tests
@@ -83,16 +47,16 @@ jobs:
8347

8448
- name: Run integration tests
8549
env:
86-
USER_NAME: ${{ env.USERNAME }}
87-
PASSWORD: ${{ env.PASSWORD }}
88-
SERVICE_ID: ${{ env.CLIENT_ID }}
89-
SERVICE_SECRET: ${{ env.CLIENT_SECRET }}
50+
USER_NAME: ${{ secrets.FIREBOLT_STG_USERNAME}}
51+
PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }}
52+
SERVICE_ID: ${{ secrets.SERVICE_ID_STG }}
53+
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET_STG }}
9054
DATABASE_NAME: ${{ steps.setup.outputs.database_name }}
9155
ENGINE_NAME: ${{ steps.setup.outputs.engine_name }}
9256
ENGINE_URL: ${{ steps.setup.outputs.engine_url }}
9357
STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }}
9458
STOPPED_ENGINE_URL: ${{ steps.setup.outputs.stopped_engine_url }}
95-
API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io"
59+
API_ENDPOINT: "api.staging.firebolt.io"
9660
ACCOUNT_NAME: "firebolt"
9761
run: |
9862
pytest --last-failed -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=INFO tests/integration -k "not V2" --runslow

‎.github/workflows/integration-tests-v2.yml‎

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
name: Integration tests FB 2.0
22
on:
33
workflow_dispatch:
4-
inputs:
5-
environment:
6-
description: 'Environment to run the tests against'
7-
type: choice
8-
required: true
9-
default: 'dev'
10-
options:
11-
- dev
12-
- staging
134
workflow_call:
14-
inputs:
15-
environment:
16-
default: 'staging'
17-
required: false
18-
type: string
195
secrets:
206
FIREBOLT_CLIENT_ID_STG_NEW_IDN:
217
required: true
228
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN:
239
required: true
24-
FIREBOLT_CLIENT_ID_NEW_IDN:
25-
required: true
26-
FIREBOLT_CLIENT_SECRET_NEW_IDN:
27-
required: true
10+
2811
jobs:
2912
tests:
3013
runs-on: ubuntu-latest
@@ -42,33 +25,23 @@ jobs:
4225
python -m pip install --upgrade pip
4326
pip install ".[dev]"
4427
45-
- name: Determine env variables
46-
run: |
47-
if [ "${{ inputs.environment }}" == 'staging' ]; then
48-
echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}" >> "$GITHUB_ENV"
49-
echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}" >> "$GITHUB_ENV"
50-
else
51-
echo "CLIENT_ID=${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}" >> "$GITHUB_ENV"
52-
echo "CLIENT_SECRET=${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}" >> "$GITHUB_ENV"
53-
fi
54-
5528
- name: Setup database and engine
5629
id: setup
5730
uses: firebolt-db/integration-testing-setup@v2
5831
with:
59-
firebolt-client-id: ${{ env.CLIENT_ID }}
60-
firebolt-client-secret: ${{ env.CLIENT_SECRET }}
61-
account: "developer"
62-
api-endpoint: "api.${{ inputs.environment }}.firebolt.io"
32+
firebolt-client-id: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
33+
firebolt-client-secret: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
34+
account: ${{ vars.FIREBOLT_ACCOUNT }}
35+
api-endpoint: "api.staging.firebolt.io"
6336

6437
- name: Run integration tests
6538
env:
66-
SERVICE_ID: ${{ env.CLIENT_ID }}
67-
SERVICE_SECRET: ${{ env.CLIENT_SECRET }}
39+
SERVICE_ID: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
40+
SERVICE_SECRET: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
6841
DATABASE_NAME: ${{ steps.setup.outputs.database_name }}
6942
ENGINE_NAME: ${{ steps.setup.outputs.engine_name }}
7043
STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }}
71-
API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io"
72-
ACCOUNT_NAME: "developer"
44+
API_ENDPOINT: "api.staging.firebolt.io"
45+
ACCOUNT_NAME: ${{ vars.FIREBOLT_ACCOUNT }}
7346
run: |
7447
pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=WARNING tests/integration -k "not V1" --runslow

‎.github/workflows/integration-tests.yml‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
11
name: Integration tests
22
on:
33
workflow_dispatch:
4-
inputs:
5-
environment:
6-
description: 'Environment to run the tests against'
7-
type: choice
8-
required: true
9-
default: 'dev'
10-
options:
11-
- dev
12-
- staging
134
workflow_call:
14-
inputs:
15-
environment:
16-
default: 'staging'
17-
required: false
18-
type: string
195
secrets:
20-
FIREBOLT_USERNAME:
21-
required: true
22-
FIREBOLT_PASSWORD:
23-
required: true
246
FIREBOLT_STG_USERNAME:
257
required: true
268
FIREBOLT_STG_PASSWORD:
279
required: true
28-
SERVICE_ID:
29-
required: true
30-
SERVICE_SECRET:
31-
required: true
3210
SERVICE_ID_STG:
3311
required: true
3412
SERVICE_SECRET_STG:
@@ -38,30 +16,10 @@ on:
3816
required: true
3917
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN:
4018
required: true
41-
FIREBOLT_CLIENT_ID_NEW_IDN:
42-
required: true
43-
FIREBOLT_CLIENT_SECRET_NEW_IDN:
44-
required: true
4519
jobs:
4620
integration-test-v1:
4721
uses: ./.github/workflows/integration-tests-v1.yml
48-
with:
49-
environment: ${{ inputs.environment }}
50-
secrets:
51-
FIREBOLT_USERNAME: ${{ secrets.FIREBOLT_USERNAME }}
52-
FIREBOLT_PASSWORD: ${{ secrets.FIREBOLT_PASSWORD }}
53-
FIREBOLT_STG_USERNAME: ${{ secrets.FIREBOLT_STG_USERNAME }}
54-
FIREBOLT_STG_PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }}
55-
SERVICE_ID: ${{ secrets.SERVICE_ID }}
56-
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
57-
SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }}
58-
SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }}
22+
secrets: inherit
5923
integration-test-v2:
6024
uses: ./.github/workflows/integration-tests-v2.yml
61-
with:
62-
environment: ${{ inputs.environment }}
63-
secrets:
64-
FIREBOLT_CLIENT_ID_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
65-
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
66-
FIREBOLT_CLIENT_ID_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}
67-
FIREBOLT_CLIENT_SECRET_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}
25+
secrets: inherit

‎.github/workflows/nightly-v2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
firebolt-client-id: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
5050
firebolt-client-secret: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
5151
api-endpoint: "api.staging.firebolt.io"
52-
account: "developer"
52+
account: ${{ vars.FIREBOLT_ACCOUNT }}
5353
db_suffix: ${{ format('{0}_{1}', matrix.os, matrix.python-version) }}
5454

5555
- name: Run integration tests
@@ -59,7 +59,7 @@ jobs:
5959
DATABASE_NAME: ${{ steps.setup.outputs.database_name }}
6060
ENGINE_NAME: ${{ steps.setup.outputs.engine_name }}
6161
STOPPED_ENGINE_NAME: ${{ steps.setup.outputs.stopped_engine_name }}
62-
ACCOUNT_NAME: "developer"
62+
ACCOUNT_NAME: ${{ vars.FIREBOLT_ACCOUNT }}
6363
API_ENDPOINT: "api.staging.firebolt.io"
6464
run: |
6565
pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=WARNING --junit-xml=report/junit.xml tests/integration -k "not V1"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,7 @@ on:
1313
jobs:
1414
integration-tests:
1515
uses: ./.github/workflows/integration-tests.yml
16-
with:
17-
environment: "staging"
18-
secrets:
19-
FIREBOLT_CLIENT_ID_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
20-
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
21-
FIREBOLT_CLIENT_ID_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_NEW_IDN }}
22-
FIREBOLT_CLIENT_SECRET_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_NEW_IDN }}
23-
FIREBOLT_USERNAME: ${{ secrets.FIREBOLT_USERNAME }}
24-
FIREBOLT_PASSWORD: ${{ secrets.FIREBOLT_PASSWORD }}
25-
FIREBOLT_STG_USERNAME: ${{ secrets.FIREBOLT_STG_USERNAME }}
26-
FIREBOLT_STG_PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }}
27-
SERVICE_ID: ${{ secrets.SERVICE_ID }}
28-
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
29-
SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }}
30-
SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }}
16+
secrets: inherit
3117

3218
publish:
3319
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)