Skip to content

Commit 844ce38

Browse files
authored
Merge pull request #2805 from IntersectMBO/feat/support-network-on-manual-trigger
Support network, add more host URLs, and set default tests to preview.gov.tools
2 parents ccf9e19 + 49a0a2b commit 844ce38

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

.github/workflows/test_backend.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,23 @@ on:
99
deployment:
1010
required: true
1111
type: choice
12-
default: "govtool.cardanoapi.io/api"
12+
default: "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr"
1313
options:
1414
- "sanchogov.tools/api"
1515
- "staging.govtool.byron.network/api"
1616
- "govtool.cardanoapi.io/api"
17+
- "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr"
18+
- "dev-sanchonet.govtool.byron.network/api"
19+
- "be.gov.tools"
20+
network:
21+
required: true
22+
type: choice
23+
default: "preview"
24+
options:
25+
- "sanchonet"
26+
- "preview"
27+
- "mainnet"
28+
- "preprod"
1729

1830
jobs:
1931
backend-tests:
@@ -42,16 +54,9 @@ jobs:
4254
fi
4355
python ./setup.py
4456
python -m pytest --alluredir allure-results
45-
if [[ "${{ env.NETWORK }}" == "preprod" ]]; then
46-
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREPROD }}" >> $GITHUB_ENV
47-
elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then
48-
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_SANCHONET }}" >> $GITHUB_ENV
49-
else
50-
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREVIEW }}" >> $GITHUB_ENV
51-
fi
5257
env:
5358
BASE_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io/api' }}
54-
NETWORK: ${{ vars.NETWORK }}
59+
NETWORK: ${{ inputs.network || vars.NETWORK }}
5560
KUBER_API_KEY: ${{ secrets.KUBER_API_KEY }}
5661

5762
- name: Upload report

.github/workflows/test_integration_playwright.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,22 @@ on:
99
deployment:
1010
required: true
1111
type: choice
12-
default: "govtool.cardanoapi.io"
12+
default: "preview.gov.tools"
1313
options:
1414
- "sanchogov.tools"
1515
- "staging.govtool.byron.network"
1616
- "govtool.cardanoapi.io"
1717
- "preview.gov.tools"
1818
- "gov.tools"
19+
network:
20+
required: true
21+
type: choice
22+
default: "preview"
23+
options:
24+
- "sanchonet"
25+
- "preview"
26+
- "mainnet"
27+
- "preprod"
1928

2029
workflow_run:
2130
workflows: ["Build and deploy GovTool to TEST server"]
@@ -56,23 +65,19 @@ jobs:
5665
chmod +w ./lib/_mock
5766
npm run generate-wallets
5867
59-
# Set network variables based on deployment input and environment
60-
if [[ "${{inputs.deployment}}" == "gov.tools" ]]; then
61-
export NETWORK='mainnet'
62-
else
63-
export NETWORK="${{ vars.NETWORK }}"
64-
fi
65-
6668
# Set API keys based on the network
67-
if [[ "${{ vars.NETWORK }}" == "preprod" ]]; then
69+
if [[ "${{ env.NETWORK }}" == "preprod" ]]; then
6870
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREPROD }}"
6971
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREPROD }}"
70-
elif [[ "${{ vars.NETWORK }}" == "sanchonet" ]]; then
72+
elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then
7173
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_SANCHONET }}"
7274
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_SANCHONET }}"
73-
else
75+
elif [[ "${{ env.NETWORK }}" == "preview" ]]; then
7476
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}"
7577
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREVIEW }}"
78+
else
79+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}"
80+
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_MAINNET }}"
7681
fi
7782
7883
npm test
@@ -96,6 +101,7 @@ jobs:
96101
API_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io' }}/api
97102
DOCS_URL: ${{ vars.DOCS_URL }}
98103
KUBER_API_KEY: ${{secrets.KUBER_API_KEY}}
104+
NETWORK: ${{ inputs.network || vars.NETWORK }}
99105
TEST_WORKERS: ${{vars.TEST_WORKERS}}
100106
CI: ${{vars.CI}}
101107
FAUCET_ADDRESS: ${{vars.FAUCET_ADDRESS}}

tests/govtool-backend/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
METRICS_API_SECRET = os.getenv("METRICS_API_SECRET")
1414
KUBER_API_URL = f'https://{os.getenv("NETWORK","preview")}.kuber.cardanoapi.io'
1515
KUBER_API_KEY = os.getenv("KUBER_API_KEY")
16-
FAUCET_API_URL = f'https://faucet.${os.getenv("NETWORK","preview")}.world.dev.cardano.org'
16+
FAUCET_API_URL = f'https://faucet.{os.getenv("NETWORK","preview")}.world.dev.cardano.org'
1717
FACUET_API_KEY = os.getenv("FAUCET_API_KEY")

0 commit comments

Comments
 (0)