From 7608ea7af0290b5d69fafd432c2aecbf68cc2edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Thu, 9 Jun 2022 10:59:29 +0200 Subject: [PATCH] Makefile: make test should work with any directory name docker-compose exec is more reliable as it doesn't depend on the name of the directory (the first part of the container name). I tried to run the `make test` comman on Jenkins, but it failed as the checkout directory was storj_main (or storj_debug). Change-Id: I85b060ebd0705a2a9fcaefa17033c61a0509c4a2 --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 746366b59..00b7dc841 100644 --- a/Makefile +++ b/Makefile @@ -159,15 +159,15 @@ test/setup: @docker compose -f docker-compose.tests.yaml down -v --remove-orphans ## cleanup previous data @docker compose -f docker-compose.tests.yaml up -d @sleep 3 - @docker exec -it storj-crdb1-1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' - @docker exec -it storj-crdb2-1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' - @docker exec -it storj-crdb3-1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' - @docker exec -it storj-crdb4-1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' - @docker exec -it storj-crdb5-1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' - @docker exec -it storj-crdb4-1 bash -c 'cockroach sql --insecure -e "create database testmetabase;"' - @docker exec -it storj-postgres-1 bash -c 'echo "postgres" | psql -U postgres -c "create database teststorj;"' - @docker exec -it storj-postgres-1 bash -c 'echo "postgres" | psql -U postgres -c "create database testmetabase;"' - @docker exec -it storj-postgres-1 bash -c 'echo "postgres" | psql -U postgres -c "ALTER ROLE postgres CONNECTION LIMIT -1;"' + @docker compose -f docker-compose.tests.yaml exec crdb1 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' + @docker compose -f docker-compose.tests.yaml exec crdb2 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' + @docker compose -f docker-compose.tests.yaml exec crdb3 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' + @docker compose -f docker-compose.tests.yaml exec crdb4 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' + @docker compose -f docker-compose.tests.yaml exec crdb5 bash -c 'cockroach sql --insecure -e "create database testcockroach;"' + @docker compose -f docker-compose.tests.yaml exec crdb4 bash -c 'cockroach sql --insecure -e "create database testmetabase;"' + @docker compose -f docker-compose.tests.yaml exec postgres bash -c 'echo "postgres" | psql -U postgres -c "create database teststorj;"' + @docker compose -f docker-compose.tests.yaml exec postgres bash -c 'echo "postgres" | psql -U postgres -c "create database testmetabase;"' + @docker compose -f docker-compose.tests.yaml exec postgres bash -c 'echo "postgres" | psql -U postgres -c "ALTER ROLE postgres CONNECTION LIMIT -1;"' .PHONY: test/postgres test/postgres: test/setup ## Run tests against Postgres (developer)