diff --git a/test/commander_test.rb b/test/commander_test.rb index fc047d4fe..4f0a829eb 100644 --- a/test/commander_test.rb +++ b/test/commander_test.rb @@ -154,7 +154,7 @@ class CommanderTest < ActiveSupport::TestCase configure_with(:deploy_with_single_accessory) assert_equal [ "1.1.1.5" ], @kamal.accessory_hosts - configure_with(:deploy_with_accessories) + configure_with(:deploy_with_accessories_on_independent_server) assert_equal [ "1.1.1.5", "1.1.1.1", "1.1.1.2" ], @kamal.accessory_hosts end @@ -163,7 +163,7 @@ class CommanderTest < ActiveSupport::TestCase @kamal.specific_roles = [ "web" ] assert_equal [], @kamal.accessory_hosts - configure_with(:deploy_with_accessories) + configure_with(:deploy_with_accessories_on_independent_server) @kamal.specific_roles = [ "web" ] assert_equal [ "1.1.1.1", "1.1.1.2" ], @kamal.accessory_hosts diff --git a/test/fixtures/deploy_with_accessories.yml b/test/fixtures/deploy_with_accessories.yml index e6c6825f5..29f502ece 100644 --- a/test/fixtures/deploy_with_accessories.yml +++ b/test/fixtures/deploy_with_accessories.yml @@ -16,7 +16,7 @@ builder: accessories: mysql: image: mysql:5.7 - host: 1.1.1.5 + host: 1.1.1.3 port: 3306 env: clear: diff --git a/test/fixtures/deploy_with_accessories_on_independent_server.yml b/test/fixtures/deploy_with_accessories_on_independent_server.yml new file mode 100644 index 000000000..e6c6825f5 --- /dev/null +++ b/test/fixtures/deploy_with_accessories_on_independent_server.yml @@ -0,0 +1,38 @@ +service: app +image: dhh/app +servers: + web: + - "1.1.1.1" + - "1.1.1.2" + workers: + - "1.1.1.3" + - "1.1.1.4" +registry: + username: user + password: pw +builder: + arch: amd64 + +accessories: + mysql: + image: mysql:5.7 + host: 1.1.1.5 + port: 3306 + env: + clear: + MYSQL_ROOT_HOST: '%' + secret: + - MYSQL_ROOT_PASSWORD + files: + - test/fixtures/files/my.cnf:/etc/mysql/my.cnf + directories: + - data:/var/lib/mysql + redis: + image: redis:latest + roles: + - web + port: 6379 + directories: + - data:/data + +readiness_delay: 0