diff --git a/.circleci/config.yml b/.circleci/config.yml index bb01c1f07..bce65182e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: cd BTCPayServer.Tests docker-compose down --v docker-compose build - docker-compose run tests + docker-compose run -e TESTS_RUN_EXTERNAL_INTEGRATION=true tests # publish jobs require $DOCKERHUB_REPO, $DOCKERHUB_USER, $DOCKERHUB_PASS defined publish_docker_linuxamd64: diff --git a/BTCPayServer.Tests/StorageTests.cs b/BTCPayServer.Tests/StorageTests.cs index f069e5757..6360a7834 100644 --- a/BTCPayServer.Tests/StorageTests.cs +++ b/BTCPayServer.Tests/StorageTests.cs @@ -236,6 +236,9 @@ namespace BTCPayServer.Tests private static string GetFromSecrets(string key) { + var connStr = Environment.GetEnvironmentVariable($"TESTS_{key}"); + if (!string.IsNullOrEmpty(connStr) && connStr != "none") + return connStr; var builder = new ConfigurationBuilder(); builder.AddUserSecrets("AB0AC1DD-9D26-485B-9416-56A33F268117"); var config = builder.Build(); diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index c23762f4d..6e5a778f6 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -19,6 +19,8 @@ services: TESTS_MYSQL: User ID=root;Host=mysql;Port=3306;Database=btcpayserver TESTS_PORT: 80 TESTS_HOSTNAME: tests + TESTS_RUN_EXTERNAL_INTEGRATION: ${TESTS_RUN_EXTERNAL_INTEGRATION:-false} + TESTS_AzureBlobStorageConnectionString: ${TESTS_AzureBlobStorageConnectionString:-none} TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc" TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc" TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify" diff --git a/BTCPayServer.Tests/docker-entrypoint.sh b/BTCPayServer.Tests/docker-entrypoint.sh index 7a7c29dcc..a659d6902 100755 --- a/BTCPayServer.Tests/docker-entrypoint.sh +++ b/BTCPayServer.Tests/docker-entrypoint.sh @@ -2,4 +2,7 @@ set -e dotnet test --filter Fast=Fast --no-build +if [[ "$TESTS_RUN_EXTERNAL_INTEGRATION" == "true" ]]; then + dotnet test --filter ExternalIntegration=ExternalIntegration --no-build -v n +fi dotnet test --filter Integration=Integration --no-build -v n