From d79db2e30ec0e7d83f79d75d8ba742d1c6ae70e9 Mon Sep 17 00:00:00 2001 From: 0xtzData Date: Sun, 26 May 2024 14:09:12 +0200 Subject: [PATCH] skip deploying contracts for ScoutCloud --- .github/workflows/e2e_scoutcloud.yaml | 16 +--------------- README.md | 10 +++++----- tests/e2e/playwright.config.ts | 2 +- tests/e2e/tests/scoutcloud/ScoutCloud.test.ts | 10 ---------- 4 files changed, 7 insertions(+), 31 deletions(-) diff --git a/.github/workflows/e2e_scoutcloud.yaml b/.github/workflows/e2e_scoutcloud.yaml index d8be0b3d..03e9eb42 100644 --- a/.github/workflows/e2e_scoutcloud.yaml +++ b/.github/workflows/e2e_scoutcloud.yaml @@ -61,25 +61,11 @@ env: SCOUTCLOUD_CHAIN_TYPE: ${{ inputs.chain_type }} SCOUTCLOUD_NODE_TYPE: ${{ inputs.node_type }} - BLOCKSCOUT_URL: ${{ secrets.E2E_BLOCKSCOUT_URL }} - FRONTEND_URL: ${{ secrets.E2E_FRONTEND_URL }} - NETWORK_URL: ${{ secrets.E2E_NETWORK_URL }} - ACCOUNT_USERNAME: ${{ secrets.ACCOUNT_USERNAME }} - ACCOUNT_PASSWORD: ${{ secrets.ACCOUNT_PASSWORD }} - MAILSLURP_API_KEY: ${{ secrets.MAILSLURP_API_KEY }} - MAILSLURP_EMAIL_ID: ${{ secrets.MAILSLURP_EMAIL_ID }} - ENV: test - RESOURCE_MODE: account - PUBLIC: false - PORT: 4000 - PORT_PG: 5432 - PORT_NETWORK_HTTP: 8545 - PORT_NETWORK_WS: 8546 - WALLET: ${{ secrets.WALLET }} PWDEBUG: 0 LOAD_AUTH_CTX: 0 LOAD_CONTRACTS_DATA: 0 ACCOUNT: 1 + PROD: 1 jobs: e2e_tests: diff --git a/README.md b/README.md index fd0118f9..e55b7626 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Blockscout E2E testing -[![E2E Prod tests](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_prod.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_prod.yaml) -[![E2E Testnet tests (Rollup)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_rollup.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_rollup.yaml) -[![E2E K8s](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_account.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_account.yaml) +[![Production](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_prod.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_prod.yaml) +[![Testnets (Rollup)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_rollup.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_rollup.yaml) +[![K8s](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_account.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_account.yaml) [![Admin console tests](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_admin.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_admin.yaml) -[![Load smoke](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/load_smoke.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/load_baseline.yaml) +[![ScoutCloud](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_scoutcloud.yaml/badge.svg)](https://github.com/blockscout/blockscout-ci-cd/actions/workflows/e2e_scoutcloud.yaml) -This repo contains E2E and stress/load tests for blockscout APIs \ No newline at end of file +This repo contains E2E and stress/load tests for Blockscout APIs \ No newline at end of file diff --git a/tests/e2e/playwright.config.ts b/tests/e2e/playwright.config.ts index 753bded3..6823647f 100644 --- a/tests/e2e/playwright.config.ts +++ b/tests/e2e/playwright.config.ts @@ -30,7 +30,7 @@ const config: PlaywrightTestConfig = { { name: `ScoutCloud`, use: { - baseURL: `https://scoutcloud.services.blockscout.com`, + baseURL: process.env.SCOUTCLOUD_URL, extraHTTPHeaders: { Accept: `application/vnd.github.v3+json`, 'x-api-key': `663867b8-689c-428c-8676-eee9d2fd6089`, diff --git a/tests/e2e/tests/scoutcloud/ScoutCloud.test.ts b/tests/e2e/tests/scoutcloud/ScoutCloud.test.ts index c819ada9..cfced5fe 100644 --- a/tests/e2e/tests/scoutcloud/ScoutCloud.test.ts +++ b/tests/e2e/tests/scoutcloud/ScoutCloud.test.ts @@ -24,16 +24,6 @@ const l = winston.createLogger({ test.describe.configure({ mode: `parallel` }) -export default defineConfig({ - use: { - baseURL: `https://scoutcloud.services.blockscout.com`, - extraHTTPHeaders: { - Accept: `application/vnd.github.v3+json`, - 'x-api-key': process.env.SCOUTCLOUD_TOKEN, - }, - }, -}) - const createInstance = async (r, cfg) => { const response = await r.post(`/api/v1/instances`, { data: cfg,