Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/integration-tests-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ on:
default: 'staging'
required: false
type: string
branch:
required: false
type: string
description: 'Branch to run on'
secrets:
FIREBOLT_USERNAME:
required: true
Expand All @@ -33,14 +29,16 @@ on:
required: true
SERVICE_SECRET:
required: true
SERVICE_ID_STG:
required: true
SERVICE_SECRET_STG:
required: true
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
with:
ref: ${{ inputs.branch }}

- name: Set up Python 3.7
uses: actions/setup-python@v2
Expand All @@ -62,8 +60,8 @@ jobs:
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.SERVICE_ID }}" >> "$GITHUB_ENV"
echo "CLIENT_SECRET=${{ secrets.SERVICE_SECRET }}" >> "$GITHUB_ENV"
fi

- name: Setup database and engine
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/integration-tests-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ on:
default: 'staging'
required: false
type: string
branch:
required: false
type: string
description: 'Branch to run on'
secrets:
FIREBOLT_CLIENT_ID_STG_NEW_IDN:
required: true
Expand All @@ -35,8 +31,6 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
with:
ref: ${{ inputs.branch }}

- name: Set up Python 3.7
uses: actions/setup-python@v2
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ on:
default: 'staging'
required: false
type: string
branch:
required: false
type: string
description: 'Branch to run on'
secrets:
FIREBOLT_USERNAME:
required: true
Expand All @@ -33,6 +29,10 @@ on:
required: true
SERVICE_SECRET:
required: true
SERVICE_ID_STG:
required: true
SERVICE_SECRET_STG:
required: true
# V2 secrets
FIREBOLT_CLIENT_ID_STG_NEW_IDN:
required: true
Expand All @@ -46,20 +46,20 @@ jobs:
integration-test-v1:
uses: ./.github/workflows/integration-tests-v1.yml
with:
environment: ${{ github.event.inputs.environment }}
branch: ${{ github.event.inputs.branch }}
environment: ${{ inputs.environment }}
secrets:
FIREBOLT_USERNAME: ${{ secrets.FIREBOLT_USERNAME }}
FIREBOLT_PASSWORD: ${{ secrets.FIREBOLT_PASSWORD }}
FIREBOLT_STG_USERNAME: ${{ secrets.FIREBOLT_STG_USERNAME }}
FIREBOLT_STG_PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }}
SERVICE_ID: ${{ secrets.SERVICE_ID }}
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }}
SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }}
integration-test-v2:
uses: ./.github/workflows/integration-tests-v2.yml
with:
environment: ${{ github.event.inputs.environment }}
branch: ${{ github.event.inputs.branch }}
environment: ${{ inputs.environment }}
secrets:
FIREBOLT_CLIENT_ID_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ on:
jobs:
integration-tests:
uses: ./.github/workflows/integration-tests.yml
with:
environment: "staging"
secrets:
FIREBOLT_CLIENT_ID_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_ID_STG_NEW_IDN }}
FIREBOLT_CLIENT_SECRET_STG_NEW_IDN: ${{ secrets.FIREBOLT_CLIENT_SECRET_STG_NEW_IDN }}
Expand All @@ -24,6 +26,8 @@ jobs:
FIREBOLT_STG_PASSWORD: ${{ secrets.FIREBOLT_STG_PASSWORD }}
SERVICE_ID: ${{ secrets.SERVICE_ID }}
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
SERVICE_ID_STG: ${{ secrets.SERVICE_ID_STG }}
SERVICE_SECRET_STG: ${{ secrets.SERVICE_SECRET_STG }}

publish:
runs-on: ubuntu-latest
Expand Down