From fd76a9be6ea85ad517c44804a3bec5ce81651d4f Mon Sep 17 00:00:00 2001 From: Niraj Date: Tue, 28 Jan 2025 11:55:55 +0545 Subject: [PATCH 1/5] chore: update integration workflow to include new network options and adjust API key handling --- .../workflows/test_integration_playwright.yml | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_integration_playwright.yml b/.github/workflows/test_integration_playwright.yml index e478aec0d..766d16a13 100644 --- a/.github/workflows/test_integration_playwright.yml +++ b/.github/workflows/test_integration_playwright.yml @@ -9,13 +9,22 @@ on: deployment: required: true type: choice - default: "govtool.cardanoapi.io" + default: "preview.gov.tools" options: - "sanchogov.tools" - "staging.govtool.byron.network" - "govtool.cardanoapi.io" - "preview.gov.tools" - "gov.tools" + network: + required: true + type: choice + default: "preview" + options: + - "sanchonet" + - "preview" + - "mainnet" + - "preprod" workflow_run: workflows: ["Build and deploy GovTool to TEST server"] @@ -56,23 +65,19 @@ jobs: chmod +w ./lib/_mock npm run generate-wallets - # Set network variables based on deployment input and environment - if [[ "${{inputs.deployment}}" == "gov.tools" ]]; then - export NETWORK='mainnet' - else - export NETWORK="${{ vars.NETWORK }}" - fi - # Set API keys based on the network - if [[ "${{ vars.NETWORK }}" == "preprod" ]]; then + if [[ "${{ env.NETWORK }}" == "preprod" ]]; then export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREPROD }}" export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREPROD }}" - elif [[ "${{ vars.NETWORK }}" == "sanchonet" ]]; then + elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_SANCHONET }}" export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_SANCHONET }}" - else + elif [[ "${{ env.NETWORK }}" == "preview" ]]; then export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}" export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREVIEW }}" + else + export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}" + export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_MAINNET }}" fi npm test @@ -96,6 +101,7 @@ jobs: API_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io' }}/api DOCS_URL: ${{ vars.DOCS_URL }} KUBER_API_KEY: ${{secrets.KUBER_API_KEY}} + NETWORK: ${{ inputs.deployment || vars.NETWORK }} TEST_WORKERS: ${{vars.TEST_WORKERS}} CI: ${{vars.CI}} FAUCET_ADDRESS: ${{vars.FAUCET_ADDRESS}} From bccd47e54850a0f04ebc236a1f912b9789ef7a2f Mon Sep 17 00:00:00 2001 From: Niraj Date: Tue, 28 Jan 2025 12:25:53 +0545 Subject: [PATCH 2/5] chore: update backend test workflow to include new preview/mainnet deployment options and network selection --- .github/workflows/test_backend.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index 963405dfc..84ea5484d 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -9,11 +9,22 @@ on: deployment: required: true type: choice - default: "govtool.cardanoapi.io/api" + default: "https://z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" options: - "sanchogov.tools/api" - "staging.govtool.byron.network/api" - "govtool.cardanoapi.io/api" + - "https://z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" + - "https://be.gov.tools" + network: + required: true + type: choice + default: "preview" + options: + - "sanchonet" + - "preview" + - "mainnet" + - "preprod" jobs: backend-tests: @@ -42,16 +53,9 @@ jobs: fi python ./setup.py python -m pytest --alluredir allure-results - if [[ "${{ env.NETWORK }}" == "preprod" ]]; then - echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREPROD }}" >> $GITHUB_ENV - elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then - echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_SANCHONET }}" >> $GITHUB_ENV - else - echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREVIEW }}" >> $GITHUB_ENV - fi env: BASE_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io/api' }} - NETWORK: ${{ vars.NETWORK }} + NETWORK: ${{ inputs.network || vars.NETWORK }} KUBER_API_KEY: ${{ secrets.KUBER_API_KEY }} - name: Upload report From 96881276b41b5a5c59bded4590f411fb331364c1 Mon Sep 17 00:00:00 2001 From: Niraj Date: Tue, 28 Jan 2025 12:42:37 +0545 Subject: [PATCH 3/5] chore: remove unecessary https on deployment options --- .github/workflows/test_backend.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index 84ea5484d..caa34e79f 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -9,13 +9,13 @@ on: deployment: required: true type: choice - default: "https://z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" + default: "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" options: - "sanchogov.tools/api" - "staging.govtool.byron.network/api" - "govtool.cardanoapi.io/api" - - "https://z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" - - "https://be.gov.tools" + - "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" + - "be.gov.tools" network: required: true type: choice From db27e12877319c6452003f25288cbed91385c1d6 Mon Sep 17 00:00:00 2001 From: Niraj Date: Tue, 28 Jan 2025 13:32:17 +0545 Subject: [PATCH 4/5] chore: add dev api options on backend test deployment --- .github/workflows/test_backend.yml | 1 + tests/govtool-backend/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index caa34e79f..bc5bec70a 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -15,6 +15,7 @@ on: - "staging.govtool.byron.network/api" - "govtool.cardanoapi.io/api" - "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" + - "dev-sanchonet.govtool.byron.network/api" - "be.gov.tools" network: required: true diff --git a/tests/govtool-backend/config.py b/tests/govtool-backend/config.py index e40af8b6d..1499fbf42 100644 --- a/tests/govtool-backend/config.py +++ b/tests/govtool-backend/config.py @@ -13,5 +13,5 @@ METRICS_API_SECRET = os.getenv("METRICS_API_SECRET") KUBER_API_URL = f'https://{os.getenv("NETWORK","preview")}.kuber.cardanoapi.io' KUBER_API_KEY = os.getenv("KUBER_API_KEY") -FAUCET_API_URL = f'https://faucet.${os.getenv("NETWORK","preview")}.world.dev.cardano.org' +FAUCET_API_URL = f'https://faucet.{os.getenv("NETWORK","preview")}.world.dev.cardano.org' FACUET_API_KEY = os.getenv("FAUCET_API_KEY") From 49a0a2bdfa545361ed37d7ad79d0c0e2ca899259 Mon Sep 17 00:00:00 2001 From: Niraj Date: Tue, 28 Jan 2025 13:43:38 +0545 Subject: [PATCH 5/5] chore: update network input handling in integration test workflow --- .github/workflows/test_integration_playwright.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_integration_playwright.yml b/.github/workflows/test_integration_playwright.yml index 766d16a13..4c99c6bf2 100644 --- a/.github/workflows/test_integration_playwright.yml +++ b/.github/workflows/test_integration_playwright.yml @@ -101,7 +101,7 @@ jobs: API_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io' }}/api DOCS_URL: ${{ vars.DOCS_URL }} KUBER_API_KEY: ${{secrets.KUBER_API_KEY}} - NETWORK: ${{ inputs.deployment || vars.NETWORK }} + NETWORK: ${{ inputs.network || vars.NETWORK }} TEST_WORKERS: ${{vars.TEST_WORKERS}} CI: ${{vars.CI}} FAUCET_ADDRESS: ${{vars.FAUCET_ADDRESS}}